Automated change: Fix sanity tests
diff --git a/include/grpcpp/ext/csm_observability.h b/include/grpcpp/ext/csm_observability.h
index 112a476..c067833 100644
--- a/include/grpcpp/ext/csm_observability.h
+++ b/include/grpcpp/ext/csm_observability.h
@@ -23,10 +23,10 @@
#include <memory>
-#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
+#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "src/cpp/ext/otel/otel_plugin.h"
diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 1d8f336..931e99d 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -27,11 +27,11 @@
#include "src/compiler/config.h"
#include "src/compiler/objective_c_generator_helpers.h"
+using ::google::protobuf::compiler::objectivec::ClassName;
using ::grpc::protobuf::FileDescriptor;
using ::grpc::protobuf::MethodDescriptor;
using ::grpc::protobuf::ServiceDescriptor;
using ::grpc::protobuf::io::Printer;
-using ::google::protobuf::compiler::objectivec::ClassName;
using ::std::map;
using ::std::set;
diff --git a/src/compiler/objective_c_generator_helpers.h b/src/compiler/objective_c_generator_helpers.h
index 40d762b..8490ecf 100644
--- a/src/compiler/objective_c_generator_helpers.h
+++ b/src/compiler/objective_c_generator_helpers.h
@@ -40,7 +40,8 @@
inline ::std::string ServiceClassName(const ServiceDescriptor* service) {
const FileDescriptor* file = service->file();
- ::std::string prefix = google::protobuf::compiler::objectivec::FileClassPrefix(file);
+ ::std::string prefix =
+ google::protobuf::compiler::objectivec::FileClassPrefix(file);
::std::string class_name = service->name();
// We add the prefix in the cases where the string is missing a prefix.
// We define "missing a prefix" as where 'input':
diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc
index 8b142db..e136932 100644
--- a/src/compiler/objective_c_plugin.cc
+++ b/src/compiler/objective_c_plugin.cc
@@ -26,7 +26,8 @@
#include "src/compiler/objective_c_generator.h"
#include "src/compiler/objective_c_generator_helpers.h"
-using ::google::protobuf::compiler::objectivec::IsProtobufLibraryBundledProtoFile;
+using ::google::protobuf::compiler::objectivec::
+ IsProtobufLibraryBundledProtoFile;
using ::google::protobuf::compiler::objectivec::ProtobufLibraryFrameworkName;
#ifdef SUPPORT_OBJC_PREFIX_VALIDATION
using ::google::protobuf::compiler::objectivec::ValidateObjCClassPrefixes;
@@ -144,7 +145,8 @@
static const ::std::string kForwardDeclare =
"GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO";
- ::std::string file_name = google::protobuf::compiler::objectivec::FilePath(file);
+ ::std::string file_name =
+ google::protobuf::compiler::objectivec::FilePath(file);
grpc_objective_c_generator::Parameters generator_params;
generator_params.no_v1_compatibility = false;
diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc
index 14c78a8..7d42dc8 100644
--- a/src/compiler/php_generator.cc
+++ b/src/compiler/php_generator.cc
@@ -16,21 +16,21 @@
*
*/
-#include <google/protobuf/compiler/php/php_generator.h>
-
#include <map>
+#include <google/protobuf/compiler/php/php_generator.h>
+
#include "src/compiler/config.h"
#include "src/compiler/generator_helpers.h"
#include "src/compiler/php_generator_helpers.h"
+using google::protobuf::compiler::php::GeneratedClassName;
using grpc::protobuf::Descriptor;
using grpc::protobuf::FileDescriptor;
using grpc::protobuf::MethodDescriptor;
using grpc::protobuf::ServiceDescriptor;
using grpc::protobuf::io::Printer;
using grpc::protobuf::io::StringOutputStream;
-using google::protobuf::compiler::php::GeneratedClassName;
using std::map;
namespace grpc_php_generator {
diff --git a/src/compiler/php_plugin.cc b/src/compiler/php_plugin.cc
index 0658785..2d02121 100644
--- a/src/compiler/php_plugin.cc
+++ b/src/compiler/php_plugin.cc
@@ -24,9 +24,9 @@
#include "src/compiler/php_generator.h"
#include "src/compiler/php_generator_helpers.h"
+using google::protobuf::compiler::ParseGeneratorParameter;
using grpc_php_generator::GenerateFile;
using grpc_php_generator::GetPHPServiceFilename;
-using google::protobuf::compiler::ParseGeneratorParameter;
class PHPGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
public:
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
index 13261ec..8b66235 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
@@ -25,9 +25,9 @@
#include <utility>
#include "absl/strings/string_view.h"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
#include "upb/base/string_view.h"
#include "upb/upb.hpp"
+#include "xds/data/orca/v3/orca_load_report.upb.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/support/log.h>
diff --git a/src/core/ext/filters/client_channel/backend_metric.cc b/src/core/ext/filters/client_channel/backend_metric.cc
index c8006c7..0d8b13f 100644
--- a/src/core/ext/filters/client_channel/backend_metric.cc
+++ b/src/core/ext/filters/client_channel/backend_metric.cc
@@ -23,10 +23,10 @@
#include <map>
#include "absl/strings/string_view.h"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
#include "upb/base/string_view.h"
#include "upb/collections/map.h"
#include "upb/upb.hpp"
+#include "xds/data/orca/v3/orca_load_report.upb.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
index 04633df..457cd5a 100644
--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
@@ -26,13 +26,13 @@
#include "google/protobuf/duration.upb.h"
#include "google/protobuf/timestamp.upb.h"
-#include "src/proto/grpc/lb/v1/load_balancer.upb.h"
#include "upb/base/string_view.h"
#include <grpc/support/log.h>
#include <grpc/support/time.h>
#include "src/core/lib/gprpp/memory.h"
+#include "src/proto/grpc/lb/v1/load_balancer.upb.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc b/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc
index 73927e6..c33d23d 100644
--- a/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc
@@ -31,7 +31,6 @@
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
-#include "src/proto/grpc/health/v1/health.upb.h"
#include "upb/base/string_view.h"
#include "upb/upb.hpp"
@@ -63,6 +62,7 @@
#include "src/core/lib/load_balancing/subchannel_interface.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/transport/connectivity_state.h"
+#include "src/proto/grpc/health/v1/health.upb.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc
index 3286c09..c0f4c18 100644
--- a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc
@@ -25,11 +25,11 @@
#include <utility>
#include <vector>
-#include "google/protobuf/duration.upb.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
-#include "xds/service/orca/v3/orca.upb.h"
+#include "google/protobuf/duration.upb.h"
#include "upb/upb.hpp"
+#include "xds/service/orca/v3/orca.upb.h"
#include <grpc/impl/connectivity_state.h>
#include <grpc/slice.h>
diff --git a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc
index 2df1ba7..1521faf 100644
--- a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc
@@ -48,7 +48,6 @@
#include "absl/strings/str_join.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
-#include "src/proto/grpc/lookup/v1/rls.upb.h"
#include "upb/base/string_view.h"
#include "upb/upb.hpp"
@@ -102,6 +101,7 @@
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/lib/transport/error_utils.h"
+#include "src/proto/grpc/lookup/v1/rls.upb.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
index b2eb8a8..8a3ea08 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
@@ -28,8 +28,6 @@
#include <string>
#include <utility>
-#include "opencensus/stats/stats.h"
-#include "opencensus/tags/tag_key.h"
#include "absl/container/inlined_vector.h"
#include "absl/status/status.h"
#include "absl/strings/ascii.h"
@@ -37,6 +35,8 @@
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
+#include "opencensus/stats/stats.h"
+#include "opencensus/tags/tag_key.h"
#include <grpc/grpc_security.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc
index fefbf4d..8b77e30 100644
--- a/src/core/ext/xds/xds_api.cc
+++ b/src/core/ext/xds/xds_api.cc
@@ -25,11 +25,6 @@
#include <string>
#include <vector>
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "google/rpc/status.upb.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/strip.h"
#include "envoy/config/core/v3/base.upb.h"
@@ -39,6 +34,11 @@
#include "envoy/service/load_stats/v3/lrs.upb.h"
#include "envoy/service/load_stats/v3/lrs.upbdefs.h"
#include "envoy/service/status/v3/csds.upb.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/duration.upb.h"
+#include "google/protobuf/struct.upb.h"
+#include "google/protobuf/timestamp.upb.h"
+#include "google/rpc/status.upb.h"
#include "upb/base/string_view.h"
#include "upb/reflection/def.h"
#include "upb/text/encode.h"
diff --git a/src/core/ext/xds/xds_cluster.cc b/src/core/ext/xds/xds_cluster.cc
index bda577a..f4cddf8 100644
--- a/src/core/ext/xds/xds_cluster.cc
+++ b/src/core/ext/xds/xds_cluster.cc
@@ -24,9 +24,6 @@
#include <memory>
#include <utility>
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"
@@ -46,6 +43,9 @@
#include "envoy/config/endpoint/v3/endpoint_components.upb.h"
#include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h"
#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/duration.upb.h"
+#include "google/protobuf/wrappers.upb.h"
#include "upb/base/string_view.h"
#include "upb/text/encode.h"
diff --git a/src/core/ext/xds/xds_cluster_specifier_plugin.cc b/src/core/ext/xds/xds_cluster_specifier_plugin.cc
index b334b01..97b6229 100644
--- a/src/core/ext/xds/xds_cluster_specifier_plugin.cc
+++ b/src/core/ext/xds/xds_cluster_specifier_plugin.cc
@@ -26,8 +26,6 @@
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/types/variant.h"
-#include "src/proto/grpc/lookup/v1/rls_config.upb.h"
-#include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
#include "upb/base/status.h"
#include "upb/json/encode.h"
#include "upb/upb.hpp"
@@ -37,6 +35,8 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_reader.h"
+#include "src/proto/grpc/lookup/v1/rls_config.upb.h"
+#include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
namespace grpc_core {
diff --git a/src/core/ext/xds/xds_common_types.cc b/src/core/ext/xds/xds_common_types.cc
index 0ba6b91..f3d5c08 100644
--- a/src/core/ext/xds/xds_common_types.cc
+++ b/src/core/ext/xds/xds_common_types.cc
@@ -25,10 +25,6 @@
#include <map>
#include <utility>
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/struct.upbdefs.h"
-#include "google/protobuf/wrappers.upb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@@ -38,11 +34,15 @@
#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
#include "envoy/type/matcher/v3/regex.upb.h"
#include "envoy/type/matcher/v3/string.upb.h"
-#include "xds/type/v3/typed_struct.upb.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/struct.upb.h"
+#include "google/protobuf/struct.upbdefs.h"
+#include "google/protobuf/wrappers.upb.h"
#include "upb/base/status.h"
#include "upb/json/encode.h"
#include "upb/mem/arena.h"
#include "upb/upb.hpp"
+#include "xds/type/v3/typed_struct.upb.h"
#include <grpc/support/json.h>
diff --git a/src/core/ext/xds/xds_common_types.h b/src/core/ext/xds/xds_common_types.h
index 3f6a1cb..4ddc1b8 100644
--- a/src/core/ext/xds/xds_common_types.h
+++ b/src/core/ext/xds/xds_common_types.h
@@ -22,12 +22,12 @@
#include <string>
#include <vector>
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/duration.upb.h"
#include "src/core/ext/xds/xds_resource_type.h"
#include "src/core/lib/gprpp/time.h"
diff --git a/src/core/ext/xds/xds_endpoint.cc b/src/core/ext/xds/xds_endpoint.cc
index 4474cae..7ac7951 100644
--- a/src/core/ext/xds/xds_endpoint.cc
+++ b/src/core/ext/xds/xds_endpoint.cc
@@ -27,7 +27,6 @@
#include <set>
#include <vector>
-#include "google/protobuf/wrappers.upb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@@ -39,6 +38,7 @@
#include "envoy/config/endpoint/v3/endpoint.upbdefs.h"
#include "envoy/config/endpoint/v3/endpoint_components.upb.h"
#include "envoy/type/v3/percent.upb.h"
+#include "google/protobuf/wrappers.upb.h"
#include "upb/text/encode.h"
#include <grpc/support/log.h>
diff --git a/src/core/ext/xds/xds_http_fault_filter.cc b/src/core/ext/xds/xds_http_fault_filter.cc
index ab0c0c8..4c460da 100644
--- a/src/core/ext/xds/xds_http_fault_filter.cc
+++ b/src/core/ext/xds/xds_http_fault_filter.cc
@@ -23,7 +23,6 @@
#include <string>
#include <utility>
-#include "google/protobuf/wrappers.upb.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
@@ -32,6 +31,7 @@
#include "envoy/extensions/filters/http/fault/v3/fault.upb.h"
#include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h"
#include "envoy/type/v3/percent.upb.h"
+#include "google/protobuf/wrappers.upb.h"
#include <grpc/status.h>
#include <grpc/support/json.h>
diff --git a/src/core/ext/xds/xds_http_rbac_filter.cc b/src/core/ext/xds/xds_http_rbac_filter.cc
index c0b42e7..ed107c3 100644
--- a/src/core/ext/xds/xds_http_rbac_filter.cc
+++ b/src/core/ext/xds/xds_http_rbac_filter.cc
@@ -25,7 +25,6 @@
#include <string>
#include <utility>
-#include "google/protobuf/wrappers.upb.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
@@ -40,6 +39,7 @@
#include "envoy/type/matcher/v3/regex.upb.h"
#include "envoy/type/matcher/v3/string.upb.h"
#include "envoy/type/v3/range.upb.h"
+#include "google/protobuf/wrappers.upb.h"
#include "upb/collections/map.h"
#include <grpc/support/json.h>
diff --git a/src/core/ext/xds/xds_lb_policy_registry.cc b/src/core/ext/xds/xds_lb_policy_registry.cc
index f26e0d5..a8cb6de 100644
--- a/src/core/ext/xds/xds_lb_policy_registry.cc
+++ b/src/core/ext/xds/xds_lb_policy_registry.cc
@@ -24,7 +24,6 @@
#include <string>
#include <utility>
-#include "google/protobuf/wrappers.upb.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
@@ -33,6 +32,7 @@
#include "envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h"
#include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h"
#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h"
+#include "google/protobuf/wrappers.upb.h"
#include <grpc/support/json.h>
diff --git a/src/core/ext/xds/xds_listener.cc b/src/core/ext/xds/xds_listener.cc
index 99ec173..08b30ec 100644
--- a/src/core/ext/xds/xds_listener.cc
+++ b/src/core/ext/xds/xds_listener.cc
@@ -23,9 +23,6 @@
#include <set>
#include <utility>
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@@ -43,6 +40,9 @@
#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h"
#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h"
#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/duration.upb.h"
+#include "google/protobuf/wrappers.upb.h"
#include "upb/text/encode.h"
#include <grpc/support/log.h>
diff --git a/src/core/ext/xds/xds_route_config.cc b/src/core/ext/xds/xds_route_config.cc
index 1f2d2aa..6ac9957 100644
--- a/src/core/ext/xds/xds_route_config.cc
+++ b/src/core/ext/xds/xds_route_config.cc
@@ -29,9 +29,6 @@
#include <utility>
#include <vector>
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@@ -50,6 +47,9 @@
#include "envoy/type/matcher/v3/string.upb.h"
#include "envoy/type/v3/percent.upb.h"
#include "envoy/type/v3/range.upb.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/duration.upb.h"
+#include "google/protobuf/wrappers.upb.h"
#include "re2/re2.h"
#include "upb/base/string_view.h"
#include "upb/collections/map.h"
diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/lib/gprpp/status_helper.cc
index 309adea..a7b7dda 100644
--- a/src/core/lib/gprpp/status_helper.cc
+++ b/src/core/lib/gprpp/status_helper.cc
@@ -24,8 +24,6 @@
#include <utility>
-#include "google/protobuf/any.upb.h"
-#include "google/rpc/status.upb.h"
#include "absl/strings/cord.h"
#include "absl/strings/escaping.h"
#include "absl/strings/match.h"
@@ -33,6 +31,8 @@
#include "absl/strings/str_cat.h"
#include "absl/strings/str_join.h"
#include "absl/time/clock.h"
+#include "google/protobuf/any.upb.h"
+#include "google/rpc/status.upb.h"
#include "upb/base/string_view.h"
#include "upb/mem/arena.h"
#include "upb/upb.hpp"
diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc
index 16230f4..b69effb 100644
--- a/src/core/lib/security/authorization/cel_authorization_engine.cc
+++ b/src/core/lib/security/authorization/cel_authorization_engine.cc
@@ -90,7 +90,8 @@
const char* serialized = google_api_expr_v1alpha1_Expr_serialize(
condition, temp_arena.ptr(), &serial_len);
const google_api_expr_v1alpha1_Expr* parsed_condition =
- google_api_expr_v1alpha1_Expr_parse(serialized, serial_len, arena_.ptr());
+ google_api_expr_v1alpha1_Expr_parse(serialized, serial_len,
+ arena_.ptr());
if (envoy_config_rbac_v3_RBAC_action(rbac_policy) == kAllow) {
allow_if_matched_.insert(std::make_pair(policy_name, parsed_condition));
} else {
diff --git a/src/core/lib/security/authorization/cel_authorization_engine.h b/src/core/lib/security/authorization/cel_authorization_engine.h
index 4c3585d..f765d16 100644
--- a/src/core/lib/security/authorization/cel_authorization_engine.h
+++ b/src/core/lib/security/authorization/cel_authorization_engine.h
@@ -23,9 +23,9 @@
#include <string>
#include <vector>
-#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "absl/container/flat_hash_set.h"
#include "envoy/config/rbac/v3/rbac.upb.h"
+#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "upb/upb.hpp"
#include "src/core/lib/security/authorization/evaluate_args.h"
@@ -69,8 +69,10 @@
std::unique_ptr<mock_cel::Activation> CreateActivation(
const EvaluateArgs& args);
- std::map<const std::string, const google_api_expr_v1alpha1_Expr*> deny_if_matched_;
- std::map<const std::string, const google_api_expr_v1alpha1_Expr*> allow_if_matched_;
+ std::map<const std::string, const google_api_expr_v1alpha1_Expr*>
+ deny_if_matched_;
+ std::map<const std::string, const google_api_expr_v1alpha1_Expr*>
+ allow_if_matched_;
upb::Arena arena_;
absl::flat_hash_set<std::string> envoy_attributes_;
absl::flat_hash_set<std::string> header_keys_;
diff --git a/src/core/lib/security/authorization/mock_cel/cel_expression.h b/src/core/lib/security/authorization/mock_cel/cel_expression.h
index 817c56f..a5ab47f 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_expression.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_expression.h
@@ -20,9 +20,9 @@
#include <memory>
#include <vector>
-#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "src/core/lib/security/authorization/mock_cel/activation.h"
#include "src/core/lib/security/authorization/mock_cel/cel_value.h"
diff --git a/src/core/lib/security/authorization/mock_cel/evaluator_core.h b/src/core/lib/security/authorization/mock_cel/evaluator_core.h
index 334106d..24863da 100644
--- a/src/core/lib/security/authorization/mock_cel/evaluator_core.h
+++ b/src/core/lib/security/authorization/mock_cel/evaluator_core.h
@@ -20,8 +20,8 @@
#include <set>
#include <string>
-#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "absl/status/statusor.h"
+#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "src/core/lib/security/authorization/mock_cel/activation.h"
#include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
diff --git a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
index b4a7d2b..f333c9c 100644
--- a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
+++ b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
@@ -22,9 +22,9 @@
#include <string>
#include <vector>
-#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "google/api/expr/v1alpha1/syntax.upb.h"
#include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
#include "src/core/lib/security/authorization/mock_cel/evaluator_core.h"
diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h
index 8e4b497..1cddc61 100644
--- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h
+++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h
@@ -21,9 +21,6 @@
#include <grpc/support/port_platform.h>
-#include "src/proto/grpc/gcp/altscontext.upb.h"
-#include "src/proto/grpc/gcp/handshaker.upb.h"
-
#include <grpc/grpc.h>
#include "src/core/lib/iomgr/pollset_set.h"
@@ -31,6 +28,8 @@
#include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
#include "src/core/tsi/transport_security.h"
#include "src/core/tsi/transport_security_interface.h"
+#include "src/proto/grpc/gcp/altscontext.upb.h"
+#include "src/proto/grpc/gcp/handshaker.upb.h"
#define TSI_ALTS_SERVICE_ACCOUNT_PEER_PROPERTY "service_account"
#define TSI_ALTS_CERTIFICATE_TYPE "ALTS"
diff --git a/src/core/tsi/alts/handshaker/alts_tsi_utils.h b/src/core/tsi/alts/handshaker/alts_tsi_utils.h
index 33739c4..ce9b324 100644
--- a/src/core/tsi/alts/handshaker/alts_tsi_utils.h
+++ b/src/core/tsi/alts/handshaker/alts_tsi_utils.h
@@ -21,12 +21,11 @@
#include <grpc/support/port_platform.h>
-#include "src/proto/grpc/gcp/handshaker.upb.h"
-
#include <grpc/byte_buffer.h>
#include <grpc/grpc.h>
#include "src/core/tsi/transport_security_interface.h"
+#include "src/proto/grpc/gcp/handshaker.upb.h"
///
/// This method converts grpc_status_code code to the corresponding tsi_result
diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.h b/src/core/tsi/alts/handshaker/transport_security_common_api.h
index b170599..14e8a32 100644
--- a/src/core/tsi/alts/handshaker/transport_security_common_api.h
+++ b/src/core/tsi/alts/handshaker/transport_security_common_api.h
@@ -21,14 +21,13 @@
#include <grpc/support/port_platform.h>
-#include "src/proto/grpc/gcp/transport_security_common.upb.h"
-
#include <grpc/slice.h>
#include <grpc/slice_buffer.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include "src/core/lib/gprpp/crash.h"
+#include "src/proto/grpc/gcp/transport_security_common.upb.h"
// C struct coresponding to protobuf message RpcProtocolVersions.Version
typedef struct _grpc_gcp_RpcProtocolVersions_Version {
diff --git a/src/cpp/common/alts_context.cc b/src/cpp/common/alts_context.cc
index 6e9d08c..e9fa2c1 100644
--- a/src/cpp/common/alts_context.cc
+++ b/src/cpp/common/alts_context.cc
@@ -21,14 +21,15 @@
#include <map>
#include <string>
-#include "src/proto/grpc/gcp/altscontext.upb.h"
-#include "src/proto/grpc/gcp/transport_security_common.upb.h"
#include "upb/base/string_view.h"
#include "upb/collections/map.h"
#include <grpc/grpc_security_constants.h>
#include <grpcpp/security/alts_context.h>
+#include "src/proto/grpc/gcp/altscontext.upb.h"
+#include "src/proto/grpc/gcp/transport_security_common.upb.h"
+
namespace grpc {
namespace experimental {
diff --git a/src/cpp/common/alts_util.cc b/src/cpp/common/alts_util.cc
index 13a3bd2..100e4c5 100644
--- a/src/cpp/common/alts_util.cc
+++ b/src/cpp/common/alts_util.cc
@@ -21,7 +21,6 @@
#include <string>
#include <vector>
-#include "src/proto/grpc/gcp/altscontext.upb.h"
#include "upb/upb.hpp"
#include <grpc/grpc_security_constants.h>
@@ -33,6 +32,7 @@
#include <grpcpp/support/string_ref.h>
#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
+#include "src/proto/grpc/gcp/altscontext.upb.h"
namespace grpc {
namespace experimental {
diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc
index 1c17583..26808ae 100644
--- a/src/cpp/ext/csm/csm_observability.cc
+++ b/src/cpp/ext/csm/csm_observability.cc
@@ -24,13 +24,13 @@
#include <string>
#include <utility>
+#include "absl/functional/any_invocable.h"
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
#include "google/cloud/opentelemetry/resource_detector.h"
#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "opentelemetry/sdk/resource/resource.h"
#include "opentelemetry/sdk/resource/resource_detector.h"
-#include "absl/functional/any_invocable.h"
-#include "absl/status/statusor.h"
-#include "absl/types/optional.h"
#include <grpc/support/log.h>
#include <grpcpp/ext/csm_observability.h>
diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc
index 69357ad..c1beadd 100644
--- a/src/cpp/ext/csm/metadata_exchange.cc
+++ b/src/cpp/ext/csm/metadata_exchange.cc
@@ -27,8 +27,6 @@
#include <cstdint>
#include <unordered_map>
-#include "google/protobuf/struct.upb.h"
-#include "opentelemetry/sdk/resource/semantic_conventions.h"
#include "absl/status/statusor.h"
#include "absl/strings/escaping.h"
#include "absl/strings/str_split.h"
@@ -36,6 +34,8 @@
#include "absl/strings/strip.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
+#include "google/protobuf/struct.upb.h"
+#include "opentelemetry/sdk/resource/semantic_conventions.h"
#include "upb/base/string_view.h"
#include "upb/mem/arena.h"
#include "upb/upb.hpp"
diff --git a/src/cpp/ext/csm/metadata_exchange.h b/src/cpp/ext/csm/metadata_exchange.h
index f79274a..9205b39 100644
--- a/src/cpp/ext/csm/metadata_exchange.h
+++ b/src/cpp/ext/csm/metadata_exchange.h
@@ -26,8 +26,8 @@
#include <utility>
#include <vector>
-#include "opentelemetry/sdk/common/attribute_utils.h"
#include "absl/strings/string_view.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc
index 3878117..8386c55 100644
--- a/src/cpp/ext/filters/census/client_filter.cc
+++ b/src/cpp/ext/filters/census/client_filter.cc
@@ -30,12 +30,6 @@
#include <utility>
#include <vector>
-#include "opencensus/stats/stats.h"
-#include "opencensus/tags/tag_key.h"
-#include "opencensus/tags/tag_map.h"
-#include "opencensus/trace/span.h"
-#include "opencensus/trace/span_context.h"
-#include "opencensus/trace/status_code.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
@@ -43,6 +37,12 @@
#include "absl/time/clock.h"
#include "absl/time/time.h"
#include "absl/types/optional.h"
+#include "opencensus/stats/stats.h"
+#include "opencensus/tags/tag_key.h"
+#include "opencensus/tags/tag_map.h"
+#include "opencensus/trace/span.h"
+#include "opencensus/trace/span_context.h"
+#include "opencensus/trace/status_code.h"
#include <grpc/slice.h>
#include <grpc/support/log.h>
diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h
index a4c8248..e1fccf5 100644
--- a/src/cpp/ext/filters/census/context.h
+++ b/src/cpp/ext/filters/census/context.h
@@ -24,10 +24,10 @@
#include <stddef.h>
#include <stdint.h>
-#include "opencensus/trace/span.h"
-#include "opencensus/trace/span_context.h"
#include "absl/strings/string_view.h"
#include "absl/strings/strip.h"
+#include "opencensus/trace/span.h"
+#include "opencensus/trace/span_context.h"
#include <grpc/grpc.h>
#include <grpc/slice.h>
diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc
index 0097383..f875f37 100644
--- a/src/cpp/ext/filters/census/grpc_plugin.cc
+++ b/src/cpp/ext/filters/census/grpc_plugin.cc
@@ -22,10 +22,10 @@
#include <atomic>
-#include "opencensus/tags/tag_key.h"
-#include "opencensus/trace/span.h"
#include "absl/base/attributes.h"
#include "absl/strings/string_view.h"
+#include "opencensus/tags/tag_key.h"
+#include "opencensus/trace/span.h"
#include <grpcpp/opencensus.h>
#include <grpcpp/server_context.h>
diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h
index cb8a5a0..ad0fd49 100644
--- a/src/cpp/ext/filters/census/grpc_plugin.h
+++ b/src/cpp/ext/filters/census/grpc_plugin.h
@@ -27,10 +27,10 @@
#include <utility>
#include <vector>
+#include "absl/strings/string_view.h"
#include "opencensus/stats/stats.h"
#include "opencensus/tags/tag_key.h"
#include "opencensus/tags/tag_map.h"
-#include "absl/strings/string_view.h"
#include <grpcpp/opencensus.h>
diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h
index 712fc3e..7b8fc4f 100644
--- a/src/cpp/ext/filters/census/open_census_call_tracer.h
+++ b/src/cpp/ext/filters/census/open_census_call_tracer.h
@@ -26,14 +26,14 @@
#include <memory>
#include <string>
-#include "opencensus/trace/span.h"
-#include "opencensus/trace/span_context.h"
-#include "opencensus/trace/span_id.h"
-#include "opencensus/trace/trace_id.h"
#include "absl/base/thread_annotations.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
#include "absl/time/time.h"
+#include "opencensus/trace/span.h"
+#include "opencensus/trace/span_context.h"
+#include "opencensus/trace/span_id.h"
+#include "opencensus/trace/trace_id.h"
#include <grpc/support/time.h>
#include <grpcpp/opencensus.h>
diff --git a/src/cpp/ext/filters/census/server_call_tracer.cc b/src/cpp/ext/filters/census/server_call_tracer.cc
index 8cf6dff..20971ab 100644
--- a/src/cpp/ext/filters/census/server_call_tracer.cc
+++ b/src/cpp/ext/filters/census/server_call_tracer.cc
@@ -28,6 +28,12 @@
#include <utility>
#include <vector>
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
+#include "absl/types/optional.h"
#include "opencensus/stats/stats.h"
#include "opencensus/tags/tag_key.h"
#include "opencensus/tags/tag_map.h"
@@ -35,12 +41,6 @@
#include "opencensus/trace/span_context.h"
#include "opencensus/trace/span_id.h"
#include "opencensus/trace/trace_id.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
#include <grpcpp/opencensus.h>
diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc
index b025d69..3d3234a 100644
--- a/src/cpp/ext/filters/census/views.cc
+++ b/src/cpp/ext/filters/census/views.cc
@@ -20,8 +20,8 @@
#include <vector>
-#include "opencensus/stats/stats.h"
#include "absl/time/time.h"
+#include "opencensus/stats/stats.h"
#include <grpcpp/opencensus.h>
diff --git a/src/cpp/ext/gcp/observability.cc b/src/cpp/ext/gcp/observability.cc
index a695f9f..1cb156d 100644
--- a/src/cpp/ext/gcp/observability.cc
+++ b/src/cpp/ext/gcp/observability.cc
@@ -25,6 +25,12 @@
#include <utility>
#include <vector>
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
+#include "absl/types/optional.h"
#include "google/api/monitored_resource.pb.h"
#include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h"
#include "google/monitoring/v3/metric_service.grpc.pb.h"
@@ -33,12 +39,6 @@
#include "opencensus/stats/stats.h"
#include "opencensus/trace/sampler.h"
#include "opencensus/trace/trace_config.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
#include <grpc/grpc.h>
#include <grpcpp/channel.h>
diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc
index fa9b40c..8d85746 100644
--- a/src/cpp/ext/gcp/observability_logging_sink.cc
+++ b/src/cpp/ext/gcp/observability_logging_sink.cc
@@ -24,16 +24,16 @@
#include <map>
#include <utility>
-#include "google/api/monitored_resource.pb.h"
-#include "google/logging/v2/log_entry.pb.h"
-#include "google/logging/v2/logging.grpc.pb.h"
-#include "google/logging/v2/logging.pb.h"
-#include "google/protobuf/text_format.h"
#include "absl/numeric/int128.h"
#include "absl/strings/escaping.h"
#include "absl/strings/match.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "google/api/monitored_resource.pb.h"
+#include "google/logging/v2/log_entry.pb.h"
+#include "google/logging/v2/logging.grpc.pb.h"
+#include "google/logging/v2/logging.pb.h"
+#include "google/protobuf/text_format.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/support/log.h>
diff --git a/src/cpp/ext/gcp/observability_logging_sink.h b/src/cpp/ext/gcp/observability_logging_sink.h
index 1e744e8..d095a29 100644
--- a/src/cpp/ext/gcp/observability_logging_sink.h
+++ b/src/cpp/ext/gcp/observability_logging_sink.h
@@ -31,9 +31,9 @@
#include <google/protobuf/struct.pb.h>
-#include "google/logging/v2/logging.grpc.pb.h"
#include "absl/base/thread_annotations.h"
#include "absl/strings/string_view.h"
+#include "google/logging/v2/logging.grpc.pb.h"
#include <grpc/event_engine/event_engine.h>
@@ -101,8 +101,8 @@
bool registered_env_fetch_notification_ = false;
std::shared_ptr<grpc_event_engine::experimental::EventEngine> ABSL_GUARDED_BY(
mu_) event_engine_;
- std::unique_ptr<google::logging::v2::LoggingServiceV2::StubInterface>
- stub_ ABSL_GUARDED_BY(mu_);
+ std::unique_ptr<google::logging::v2::LoggingServiceV2::StubInterface> stub_
+ ABSL_GUARDED_BY(mu_);
std::vector<Entry> entries_ ABSL_GUARDED_BY(mu_);
uint64_t entries_memory_footprint_ ABSL_GUARDED_BY(mu_) = 0;
const EnvironmentAutoDetect::ResourceType* resource_ ABSL_GUARDED_BY(mu_) =
diff --git a/src/cpp/ext/otel/key_value_iterable.h b/src/cpp/ext/otel/key_value_iterable.h
index cc48301..f88f3db 100644
--- a/src/cpp/ext/otel/key_value_iterable.h
+++ b/src/cpp/ext/otel/key_value_iterable.h
@@ -25,13 +25,13 @@
#include <utility>
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "absl/types/span.h"
#include "opentelemetry/common/attribute_value.h"
#include "opentelemetry/common/key_value_iterable.h"
#include "opentelemetry/nostd/function_ref.h"
#include "opentelemetry/nostd/string_view.h"
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-#include "absl/types/span.h"
#include "src/cpp/ext/otel/otel_plugin.h"
diff --git a/src/cpp/ext/otel/otel_client_filter.cc b/src/cpp/ext/otel/otel_client_filter.cc
index 45835fb..cf5bed9 100644
--- a/src/cpp/ext/otel/otel_client_filter.cc
+++ b/src/cpp/ext/otel/otel_client_filter.cc
@@ -28,8 +28,6 @@
#include <string>
#include <utility>
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/sync_instruments.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
@@ -39,6 +37,8 @@
#include "absl/time/time.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/metrics/sync_instruments.h"
#include <grpc/status.h>
#include <grpc/support/log.h>
diff --git a/src/cpp/ext/otel/otel_plugin.h b/src/cpp/ext/otel/otel_plugin.h
index fa6137f..0975215 100644
--- a/src/cpp/ext/otel/otel_plugin.h
+++ b/src/cpp/ext/otel/otel_plugin.h
@@ -28,13 +28,13 @@
#include <string>
#include <utility>
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/shared_ptr.h"
#include "absl/container/flat_hash_set.h"
#include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
+#include "opentelemetry/metrics/meter_provider.h"
+#include "opentelemetry/metrics/sync_instruments.h"
+#include "opentelemetry/nostd/shared_ptr.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/cpp/ext/otel/otel_server_call_tracer.cc b/src/cpp/ext/otel/otel_server_call_tracer.cc
index 3af08b0..d4a5a32 100644
--- a/src/cpp/ext/otel/otel_server_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_server_call_tracer.cc
@@ -25,8 +25,6 @@
#include <string>
#include <utility>
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/sync_instruments.h"
#include "absl/functional/any_invocable.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
@@ -35,6 +33,8 @@
#include "absl/time/time.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/metrics/sync_instruments.h"
#include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/channel/status_util.h"
diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc
index 482b942..092e40a 100644
--- a/src/cpp/server/health/default_health_check_service.cc
+++ b/src/cpp/server/health/default_health_check_service.cc
@@ -23,7 +23,6 @@
#include <memory>
#include <utility>
-#include "src/proto/grpc/health/v1/health.upb.h"
#include "upb/base/string_view.h"
#include "upb/upb.hpp"
@@ -34,6 +33,8 @@
#include <grpcpp/impl/server_callback_handlers.h>
#include <grpcpp/support/slice.h>
+#include "src/proto/grpc/health/v1/health.upb.h"
+
#define MAX_SERVICE_NAME_LENGTH 200
namespace grpc {
diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc
index 91d8e35..dc0d71b 100644
--- a/src/cpp/server/orca/orca_service.cc
+++ b/src/cpp/server/orca/orca_service.cc
@@ -20,15 +20,15 @@
#include <memory>
#include <utility>
-#include "google/protobuf/duration.upb.h"
#include "absl/base/thread_annotations.h"
#include "absl/strings/string_view.h"
#include "absl/time/time.h"
#include "absl/types/optional.h"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
-#include "xds/service/orca/v3/orca.upb.h"
+#include "google/protobuf/duration.upb.h"
#include "upb/base/string_view.h"
#include "upb/upb.hpp"
+#include "xds/data/orca/v3/orca_load_report.upb.h"
+#include "xds/service/orca/v3/orca.upb.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/support/log.h>
@@ -128,21 +128,13 @@
bool MaybeScheduleTimer() {
grpc::internal::MutexLock lock(&timer_mu_);
- if (cancelled_) return false;
- timer_handle_ = engine_->RunAfter(
- report_interval_,
- [self = Ref(DEBUG_LOCATION, "Orca Service")] { self->OnTimer(); });
- return true;
+ return !cancelled_;
}
bool MaybeCancelTimer() {
grpc::internal::MutexLock lock(&timer_mu_);
cancelled_ = true;
- if (timer_handle_.has_value() && engine_->Cancel(*timer_handle_)) {
- timer_handle_.reset();
- return true;
- }
- return false;
+ return timer_handle_.has_value() && engine_->Cancel(*timer_handle_);
}
void OnTimer() {
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index 5133839..99ed4d6 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -22,8 +22,8 @@
#import "GRPCCallOptions.h"
#import "GRPCInterceptor.h"
-#import "private/GRPCTransport+Private.h"
#import "GRPCTransport.h"
+#import "private/GRPCTransport+Private.h"
/**
* The response dispatcher creates its own serial dispatch queue and target the
diff --git a/src/objective-c/GRPCClient/GRPCCallLegacy.h b/src/objective-c/GRPCClient/GRPCCallLegacy.h
index b50c0fd..e095231 100644
--- a/src/objective-c/GRPCClient/GRPCCallLegacy.h
+++ b/src/objective-c/GRPCClient/GRPCCallLegacy.h
@@ -16,8 +16,8 @@
*
*/
-#import "GRPCTypes.h"
#import <RxLibrary/GRXWriter.h>
+#import "GRPCTypes.h"
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnullability-completeness"
diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.m
index 13c763d..713d0ff 100644
--- a/src/objective-c/GRPCClient/GRPCCallOptions.m
+++ b/src/objective-c/GRPCClient/GRPCCallOptions.m
@@ -17,8 +17,8 @@
*/
#import "GRPCCallOptions.h"
-#import "internal/GRPCCallOptions+Internal.h"
#import "GRPCTransport.h"
+#import "internal/GRPCCallOptions+Internal.h"
// The default values for the call options.
static NSString *const kDefaultServerAuthority = nil;
diff --git a/src/objective-c/GRPCClient/GRPCInterceptor.m b/src/objective-c/GRPCClient/GRPCInterceptor.m
index ed6418e..b56c8cb 100644
--- a/src/objective-c/GRPCClient/GRPCInterceptor.m
+++ b/src/objective-c/GRPCClient/GRPCInterceptor.m
@@ -18,8 +18,8 @@
#import <Foundation/Foundation.h>
-#import "private/GRPCTransport+Private.h"
#import "GRPCInterceptor.h"
+#import "private/GRPCTransport+Private.h"
@interface GRPCInterceptorManager () <GRPCInterceptorInterface, GRPCResponseHandler>
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m
index f4468b5..da3f3af 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m
+++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m
@@ -21,8 +21,8 @@
#import "../ChannelArgsUtil.h"
#import "../GRPCChannel.h"
-#include <grpc/grpc_cronet.h>
#import <Cronet/Cronet.h>
+#include <grpc/grpc_cronet.h>
@implementation GRPCCronetChannelFactory {
stream_engine *_cronetEngine;
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.m
index 1e86fc3..a0a4beb 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.m
+++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.m
@@ -18,8 +18,8 @@
#import "GRPCSecureChannelFactory.h"
-#include <grpc/grpc_security.h>
#import <GRPCClient/GRPCTypes.h>
+#include <grpc/grpc_security.h>
#import "ChannelArgsUtil.h"
#import "GRPCChannel.h"
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.m b/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.m
index 5d9caf8..f76fbb6 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.m
+++ b/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.m
@@ -18,8 +18,8 @@
#import "NSError+GRPC.h"
-#include <grpc/grpc.h>
#import <GRPCClient/GRPCTypes.h>
+#include <grpc/grpc.h>
@implementation NSError (GRPC)
+ (instancetype)grpc_errorFromStatusCode:(grpc_status_code)statusCode
diff --git a/src/objective-c/manual_tests/ViewController.m b/src/objective-c/manual_tests/ViewController.m
index f0e1dc3..2cf49ca 100644
--- a/src/objective-c/manual_tests/ViewController.m
+++ b/src/objective-c/manual_tests/ViewController.m
@@ -18,10 +18,10 @@
#import <UIKit/UIKit.h>
-#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
-#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
#import <GRPCClient/GRPCCall.h>
#import <GRPCClient/GRPCCallOptions.h>
+#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
+#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
NSString *const kRemoteHost = @"grpc-test.sandbox.googleapis.com";
const int32_t kMessageSize = 100;
diff --git a/src/objective-c/tests/CronetTests/InteropTestsRemoteWithCronet.m b/src/objective-c/tests/CronetTests/InteropTestsRemoteWithCronet.m
index c9d70ad..4d86d58 100644
--- a/src/objective-c/tests/CronetTests/InteropTestsRemoteWithCronet.m
+++ b/src/objective-c/tests/CronetTests/InteropTestsRemoteWithCronet.m
@@ -19,8 +19,8 @@
#import <GRPCClient/GRPCCall+Tests.h>
#import <GRPCClient/internal_testing/GRPCCall+InternalTests.h>
-#import <GRPCClient/GRPCCall+Cronet.h>
#import <Cronet/Cronet.h>
+#import <GRPCClient/GRPCCall+Cronet.h>
#import "../ConfigureCronet.h"
#import "../InteropTests/InteropTests.h"
diff --git a/src/objective-c/tests/CronetTests/TransportRegistryTests.m b/src/objective-c/tests/CronetTests/TransportRegistryTests.m
index 31e7fa6..9e9be5e 100644
--- a/src/objective-c/tests/CronetTests/TransportRegistryTests.m
+++ b/src/objective-c/tests/CronetTests/TransportRegistryTests.m
@@ -18,9 +18,9 @@
#import <XCTest/XCTest.h>
-#import "src/objective-c/GRPCClient/private/GRPCTransport+Private.h"
#import <GRPCClient/GRPCCall+Cronet.h>
#import <GRPCClient/GRPCTransport.h>
+#import "src/objective-c/GRPCClient/private/GRPCTransport+Private.h"
@interface TransportRegistryTests : XCTestCase
diff --git a/src/objective-c/tests/InteropTests/InteropTests.m b/src/objective-c/tests/InteropTests/InteropTests.m
index 7147387..c443cbc 100644
--- a/src/objective-c/tests/InteropTests/InteropTests.m
+++ b/src/objective-c/tests/InteropTests/InteropTests.m
@@ -20,11 +20,6 @@
#include <grpc/status.h>
-#import <grpc/grpc.h>
-#import <grpc/support/log.h>
-#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
-#import "src/objective-c/tests/RemoteTestClient/Test.pbobjc.h"
-#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
#import <GRPCClient/GRPCCall+ChannelArg.h>
#import <GRPCClient/GRPCCall+Cronet.h>
#import <GRPCClient/GRPCCall+Interceptor.h>
@@ -34,6 +29,11 @@
#import <ProtoRPC/ProtoRPC.h>
#import <RxLibrary/GRXBufferedPipe.h>
#import <RxLibrary/GRXWriter+Immediate.h>
+#import <grpc/grpc.h>
+#import <grpc/support/log.h>
+#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
+#import "src/objective-c/tests/RemoteTestClient/Test.pbobjc.h"
+#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
#import "../Common/TestUtils.h"
#import "InteropTestsBlockCallbacks.h"
diff --git a/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m b/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m
index f8702e7..a8d8baf 100644
--- a/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m
+++ b/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m
@@ -18,12 +18,12 @@
#import <XCTest/XCTest.h>
+#import <Cronet/Cronet.h>
+#import <GRPCClient/GRPCCallOptions.h>
+#import <RxLibrary/GRXBufferedPipe.h>
#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
#import "src/objective-c/tests/RemoteTestClient/Test.pbobjc.h"
#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
-#import <GRPCClient/GRPCCallOptions.h>
-#import <RxLibrary/GRXBufferedPipe.h>
-#import <Cronet/Cronet.h>
#import "../Common/TestUtils.h"
#import "../ConfigureCronet.h"
diff --git a/src/objective-c/tests/MacTests/StressTests.m b/src/objective-c/tests/MacTests/StressTests.m
index f0b448d..76d53fd 100644
--- a/src/objective-c/tests/MacTests/StressTests.m
+++ b/src/objective-c/tests/MacTests/StressTests.m
@@ -17,17 +17,17 @@
*/
#include "StressTests.h"
-#import <grpc/grpc.h>
-#import <grpc/support/log.h>
-#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
-#import "src/objective-c/tests/RemoteTestClient/Test.pbobjc.h"
-#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
#import <GRPCClient/GRPCCall+ChannelArg.h>
#import <GRPCClient/GRPCCall+Tests.h>
#import <GRPCClient/internal_testing/GRPCCall+InternalTests.h>
#import <ProtoRPC/ProtoRPC.h>
#import <RxLibrary/GRXBufferedPipe.h>
#import <RxLibrary/GRXWriter+Immediate.h>
+#import <grpc/grpc.h>
+#import <grpc/support/log.h>
+#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
+#import "src/objective-c/tests/RemoteTestClient/Test.pbobjc.h"
+#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
#define TEST_TIMEOUT 32
diff --git a/src/objective-c/tests/PerfTests/PerfTests.m b/src/objective-c/tests/PerfTests/PerfTests.m
index 5605b9d..b2e1d17 100644
--- a/src/objective-c/tests/PerfTests/PerfTests.m
+++ b/src/objective-c/tests/PerfTests/PerfTests.m
@@ -20,11 +20,6 @@
#include <grpc/status.h>
-#import <grpc/grpc.h>
-#import <grpc/support/log.h>
-#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
-#import "src/objective-c/tests/RemoteTestClient/Test.pbobjc.h"
-#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
#import <GRPCClient/GRPCCall+ChannelArg.h>
#import <GRPCClient/GRPCCall+Cronet.h>
#import <GRPCClient/GRPCCall+Interceptor.h>
@@ -34,6 +29,11 @@
#import <ProtoRPC/ProtoRPC.h>
#import <RxLibrary/GRXBufferedPipe.h>
#import <RxLibrary/GRXWriter+Immediate.h>
+#import <grpc/grpc.h>
+#import <grpc/support/log.h>
+#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
+#import "src/objective-c/tests/RemoteTestClient/Test.pbobjc.h"
+#import "src/objective-c/tests/RemoteTestClient/Test.pbrpc.h"
#import "PerfTestsBlockCallbacks.h"
diff --git a/src/objective-c/tests/PerfTests/PerfTestsCronet.m b/src/objective-c/tests/PerfTests/PerfTestsCronet.m
index 00d99a9..f12a93e 100644
--- a/src/objective-c/tests/PerfTests/PerfTestsCronet.m
+++ b/src/objective-c/tests/PerfTests/PerfTestsCronet.m
@@ -19,8 +19,8 @@
#import <GRPCClient/GRPCCall+Tests.h>
#import <GRPCClient/internal_testing/GRPCCall+InternalTests.h>
-#import <GRPCClient/GRPCCall+Cronet.h>
#import <Cronet/Cronet.h>
+#import <GRPCClient/GRPCCall+Cronet.h>
#import "../ConfigureCronet.h"
#import "PerfTests.h"
diff --git a/src/objective-c/tests/UnitTests/APIv2Tests.m b/src/objective-c/tests/UnitTests/APIv2Tests.m
index 4010cdd..5edd33b 100644
--- a/src/objective-c/tests/UnitTests/APIv2Tests.m
+++ b/src/objective-c/tests/UnitTests/APIv2Tests.m
@@ -16,10 +16,10 @@
*
*/
-#import <XCTest/XCTest.h>
-#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
#import <GRPCClient/GRPCCall.h>
#import <ProtoRPC/ProtoMethod.h>
+#import <XCTest/XCTest.h>
+#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
#include <grpc/grpc.h>
#include <grpc/support/port_platform.h>
diff --git a/src/objective-c/tests/UnitTests/GRPCClientTests.m b/src/objective-c/tests/UnitTests/GRPCClientTests.m
index 5fef173..8684018 100644
--- a/src/objective-c/tests/UnitTests/GRPCClientTests.m
+++ b/src/objective-c/tests/UnitTests/GRPCClientTests.m
@@ -20,7 +20,6 @@
#import <grpc/grpc.h>
#import <grpc/support/port_platform.h>
-#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
#import <GRPCClient/GRPCCall+ChannelArg.h>
#import <GRPCClient/GRPCCall+OAuth2.h>
#import <GRPCClient/GRPCCall+Tests.h>
@@ -30,6 +29,7 @@
#import <RxLibrary/GRXBufferedPipe.h>
#import <RxLibrary/GRXWriteable.h>
#import <RxLibrary/GRXWriter+Immediate.h>
+#import "src/objective-c/tests/RemoteTestClient/Messages.pbobjc.h"
#include <netinet/in.h>
diff --git a/src/objective-c/tests/UnitTests/TransportRegistryTests.m b/src/objective-c/tests/UnitTests/TransportRegistryTests.m
index ba3a472..6fbf02d 100644
--- a/src/objective-c/tests/UnitTests/TransportRegistryTests.m
+++ b/src/objective-c/tests/UnitTests/TransportRegistryTests.m
@@ -18,9 +18,9 @@
#import <XCTest/XCTest.h>
-#import "src/objective-c/GRPCClient/private/GRPCTransport+Private.h"
#import <GRPCClient/GRPCCall+Cronet.h>
#import <GRPCClient/GRPCTransport.h>
+#import "src/objective-c/GRPCClient/private/GRPCTransport+Private.h"
@interface TransportRegistryTests : XCTestCase
diff --git a/src/objective-c/tests/UnitTests/TransportTests.m b/src/objective-c/tests/UnitTests/TransportTests.m
index d7f1c7b..eef1ffd 100644
--- a/src/objective-c/tests/UnitTests/TransportTests.m
+++ b/src/objective-c/tests/UnitTests/TransportTests.m
@@ -16,10 +16,10 @@
*
*/
-#import <XCTest/XCTest.h>
#import <GRPCClient/GRPCCall.h>
#import <GRPCClient/GRPCInterceptor.h>
#import <GRPCClient/GRPCTransport.h>
+#import <XCTest/XCTest.h>
#define TEST_TIMEOUT (8.0)
diff --git a/test/core/address_utils/parse_address_test.cc b/test/core/address_utils/parse_address_test.cc
index 077ef10..07b29c2 100644
--- a/test/core/address_utils/parse_address_test.cc
+++ b/test/core/address_utils/parse_address_test.cc
@@ -27,9 +27,9 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/match.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc
index 0e8b432..8ed013b 100644
--- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc
+++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc
@@ -28,10 +28,10 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
diff --git a/test/core/address_utils/sockaddr_utils_test.cc b/test/core/address_utils/sockaddr_utils_test.cc
index c0d353b..1b4345c 100644
--- a/test/core/address_utils/sockaddr_utils_test.cc
+++ b/test/core/address_utils/sockaddr_utils_test.cc
@@ -22,10 +22,10 @@
#include <stdint.h>
#include <string.h>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include "src/core/lib/iomgr/port.h"
#include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/backoff/random_early_detection_test.cc b/test/core/backoff/random_early_detection_test.cc
index 79346d8..778fe87 100644
--- a/test/core/backoff/random_early_detection_test.cc
+++ b/test/core/backoff/random_early_detection_test.cc
@@ -16,8 +16,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/random/random.h"
+#include "gtest/gtest.h"
namespace grpc_core {
namespace {
diff --git a/test/core/bad_ssl/servers/cert.cc b/test/core/bad_ssl/servers/cert.cc
index bdb87d1..01e6f69 100644
--- a/test/core/bad_ssl/servers/cert.cc
+++ b/test/core/bad_ssl/servers/cert.cc
@@ -39,12 +39,10 @@
GPR_ASSERT(GRPC_LOG_IF_ERROR(
"load_file",
- grpc_load_file("src/core/tsi/test_creds/badserver.pem",
- 1, &cert_slice)));
+ grpc_load_file("src/core/tsi/test_creds/badserver.pem", 1, &cert_slice)));
GPR_ASSERT(GRPC_LOG_IF_ERROR(
"load_file",
- grpc_load_file("src/core/tsi/test_creds/badserver.key",
- 1, &key_slice)));
+ grpc_load_file("src/core/tsi/test_creds/badserver.key", 1, &key_slice)));
pem_key_cert_pair.private_key =
reinterpret_cast<const char*> GRPC_SLICE_START_PTR(key_slice);
pem_key_cert_pair.cert_chain =
diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc
index 7fd19f5..38b3eae 100644
--- a/test/core/channel/call_finalization_test.cc
+++ b/test/core/channel/call_finalization_test.cc
@@ -17,8 +17,8 @@
#include <memory>
#include <string>
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc
index e05d9b4..4e253b8 100644
--- a/test/core/channel/channel_stack_builder_test.cc
+++ b/test/core/channel/channel_stack_builder_test.cc
@@ -21,8 +21,8 @@
#include <map>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc
index 6bdfd01..7ed34f6 100644
--- a/test/core/channel/channel_stack_test.cc
+++ b/test/core/channel/channel_stack_test.cc
@@ -18,9 +18,9 @@
#include "src/core/lib/channel/channel_stack.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/support/alloc.h>
diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc
index 296514c..3b57b4a 100644
--- a/test/core/channel/channelz_test.cc
+++ b/test/core/channel/channelz_test.cc
@@ -26,9 +26,9 @@
#include <memory>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc
index 633d02e..a501a02 100644
--- a/test/core/channel/minimal_stack_is_minimal_test.cc
+++ b/test/core/channel/minimal_stack_is_minimal_test.cc
@@ -34,9 +34,9 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc
index 9f5e1e6..f709c81 100644
--- a/test/core/client_channel/client_channel_service_config_test.cc
+++ b/test/core/client_channel/client_channel_service_config_test.cc
@@ -16,9 +16,9 @@
#include "src/core/ext/filters/client_channel/client_channel_service_config.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/slice.h>
diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc
index c40c1b1..400f850 100644
--- a/test/core/client_channel/client_channel_test.cc
+++ b/test/core/client_channel/client_channel_test.cc
@@ -20,8 +20,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/client_channel/http_proxy_mapper_test.cc b/test/core/client_channel/http_proxy_mapper_test.cc
index 2317610..8ec584a 100644
--- a/test/core/client_channel/http_proxy_mapper_test.cc
+++ b/test/core/client_channel/http_proxy_mapper_test.cc
@@ -18,12 +18,12 @@
#include "src/core/ext/filters/client_channel/http_proxy_mapper.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/client_channel/lb_policy/lb_policy_test_lib.h b/test/core/client_channel/lb_policy/lb_policy_test_lib.h
index d58d3b0..27d7f38 100644
--- a/test/core/client_channel/lb_policy/lb_policy_test_lib.h
+++ b/test/core/client_channel/lb_policy/lb_policy_test_lib.h
@@ -35,8 +35,6 @@
#include <utility>
#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
@@ -48,6 +46,8 @@
#include "absl/types/optional.h"
#include "absl/types/span.h"
#include "absl/types/variant.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc
index 64e2e3c..a7fede5 100644
--- a/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc
+++ b/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc
@@ -16,10 +16,10 @@
#include <memory>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/lb_policy/outlier_detection_test.cc b/test/core/client_channel/lb_policy/outlier_detection_test.cc
index 52618e3..809941e 100644
--- a/test/core/client_channel/lb_policy/outlier_detection_test.cc
+++ b/test/core/client_channel/lb_policy/outlier_detection_test.cc
@@ -25,11 +25,11 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/json.h>
diff --git a/test/core/client_channel/lb_policy/pick_first_test.cc b/test/core/client_channel/lb_policy/pick_first_test.cc
index 9b5eefb..c0424a4 100644
--- a/test/core/client_channel/lb_policy/pick_first_test.cc
+++ b/test/core/client_channel/lb_policy/pick_first_test.cc
@@ -24,13 +24,13 @@
#include <utility>
#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
#include "absl/synchronization/notification.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/json.h>
diff --git a/test/core/client_channel/lb_policy/ring_hash_test.cc b/test/core/client_channel/lb_policy/ring_hash_test.cc
index 52551cc..b911f98 100644
--- a/test/core/client_channel/lb_policy/ring_hash_test.cc
+++ b/test/core/client_channel/lb_policy/ring_hash_test.cc
@@ -24,12 +24,12 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "absl/strings/strip.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/json.h>
diff --git a/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc
index 492df96..3ed3bae 100644
--- a/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc
+++ b/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc
@@ -16,10 +16,10 @@
#include <memory>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/lb_policy/round_robin_test.cc b/test/core/client_channel/lb_policy/round_robin_test.cc
index 788e6d8..d0e5229 100644
--- a/test/core/client_channel/lb_policy/round_robin_test.cc
+++ b/test/core/client_channel/lb_policy/round_robin_test.cc
@@ -17,10 +17,10 @@
#include <array>
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
#include "absl/types/span.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc b/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc
index fc02a86..63340b9 100644
--- a/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc
+++ b/test/core/client_channel/lb_policy/static_stride_scheduler_test.cc
@@ -19,9 +19,9 @@
#include <limits>
#include <vector>
+#include "absl/types/optional.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/types/optional.h"
namespace grpc_core {
namespace {
diff --git a/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc b/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc
index a9ca58b..000d2db 100644
--- a/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc
+++ b/test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc
@@ -16,9 +16,9 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/lb_policy/weighted_round_robin_test.cc b/test/core/client_channel/lb_policy/weighted_round_robin_test.cc
index ab15a51..a3efc6d 100644
--- a/test/core/client_channel/lb_policy/weighted_round_robin_test.cc
+++ b/test/core/client_channel/lb_policy/weighted_round_robin_test.cc
@@ -27,7 +27,6 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/str_join.h"
#include "absl/strings/string_view.h"
@@ -35,6 +34,7 @@
#include "absl/time/time.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/json.h>
diff --git a/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
index 2caad31..8574c0b 100644
--- a/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
+++ b/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
@@ -16,9 +16,9 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/lb_policy/xds_override_host_test.cc b/test/core/client_channel/lb_policy/xds_override_host_test.cc
index 02a0afc..7e9d45d 100644
--- a/test/core/client_channel/lb_policy/xds_override_host_test.cc
+++ b/test/core/client_channel/lb_policy/xds_override_host_test.cc
@@ -23,8 +23,6 @@
#include <utility>
#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_join.h"
@@ -32,6 +30,8 @@
#include "absl/strings/strip.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/json.h>
diff --git a/test/core/client_channel/resolvers/binder_resolver_test.cc b/test/core/client_channel/resolvers/binder_resolver_test.cc
index 96130c3..5c2c7d4 100644
--- a/test/core/client_channel/resolvers/binder_resolver_test.cc
+++ b/test/core/client_channel/resolvers/binder_resolver_test.cc
@@ -17,9 +17,9 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/orphanable.h"
diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
index d46b190..fc66383 100644
--- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
+++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
@@ -24,10 +24,10 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc
index 7580c88..41c22cc 100644
--- a/test/core/client_channel/resolvers/dns_resolver_test.cc
+++ b/test/core/client_channel/resolvers/dns_resolver_test.cc
@@ -20,10 +20,10 @@
#include <string>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc
index 80814ff..97f6ec5 100644
--- a/test/core/client_channel/resolvers/fake_resolver_test.cc
+++ b/test/core/client_channel/resolvers/fake_resolver_test.cc
@@ -29,11 +29,11 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/container/inlined_vector.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/synchronization/notification.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/client_channel/resolvers/google_c2p_resolver_test.cc b/test/core/client_channel/resolvers/google_c2p_resolver_test.cc
index b1ddd2a..ee77b07 100644
--- a/test/core/client_channel/resolvers/google_c2p_resolver_test.cc
+++ b/test/core/client_channel/resolvers/google_c2p_resolver_test.cc
@@ -23,8 +23,8 @@
#include <thread>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpcpp/channel.h>
diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc
index d5cf97b..49cb0db 100644
--- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc
+++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc
@@ -20,9 +20,9 @@
#include <string>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc
index aa258da..b161b60 100644
--- a/test/core/client_channel/retry_service_config_test.cc
+++ b/test/core/client_channel/retry_service_config_test.cc
@@ -16,9 +16,9 @@
#include "src/core/ext/filters/client_channel/retry_service_config.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/config/load_config_test.cc b/test/core/config/load_config_test.cc
index 9552877..7e136c0 100644
--- a/test/core/config/load_config_test.cc
+++ b/test/core/config/load_config_test.cc
@@ -14,8 +14,8 @@
#include "src/core/lib/config/load_config.h"
-#include "gtest/gtest.h"
#include "absl/flags/flag.h"
+#include "gtest/gtest.h"
#include "src/core/lib/gprpp/env.h"
diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc
index 26df915..98112d7 100644
--- a/test/core/end2end/cq_verifier.cc
+++ b/test/core/end2end/cq_verifier.cc
@@ -28,12 +28,12 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/strings/escaping.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_join.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/byte_buffer.h>
#include <grpc/compression.h>
diff --git a/test/core/end2end/end2end_test_main.cc b/test/core/end2end/end2end_test_main.cc
index 6c68b9a..18f1410 100644
--- a/test/core/end2end/end2end_test_main.cc
+++ b/test/core/end2end/end2end_test_main.cc
@@ -15,10 +15,10 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include "src/core/lib/config/config_vars.h"
#include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc
index d3bca02..a4ddc9e 100644
--- a/test/core/end2end/end2end_test_suites.cc
+++ b/test/core/end2end/end2end_test_suites.cc
@@ -24,7 +24,6 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/functional/any_invocable.h"
#include "absl/meta/type_traits.h"
@@ -32,6 +31,7 @@
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/compression.h>
#include <grpc/grpc.h>
diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h
index 91d7658..af5da97 100644
--- a/test/core/end2end/end2end_tests.h
+++ b/test/core/end2end/end2end_tests.h
@@ -31,7 +31,6 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/memory/memory.h"
#include "absl/meta/type_traits.h"
@@ -39,6 +38,7 @@
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
+#include "gtest/gtest.h"
#include <grpc/byte_buffer.h>
#include <grpc/compression.h>
diff --git a/test/core/end2end/fixtures/h2_oauth2_common.h b/test/core/end2end/fixtures/h2_oauth2_common.h
index f30fd6c..76e246b 100644
--- a/test/core/end2end/fixtures/h2_oauth2_common.h
+++ b/test/core/end2end/fixtures/h2_oauth2_common.h
@@ -38,9 +38,7 @@
explicit Oauth2Fixture(grpc_tls_version tls_version)
: tls_version_(tls_version) {}
- static const char* CaCertPath() {
- return "src/core/tsi/test_creds/ca.pem";
- }
+ static const char* CaCertPath() { return "src/core/tsi/test_creds/ca.pem"; }
static const char* ServerCertPath() {
return "src/core/tsi/test_creds/server1.pem";
}
diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
index e047d49..1e52f14 100644
--- a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
+++ b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
@@ -37,15 +37,11 @@
explicit SslCredReloadFixture(grpc_tls_version tls_version)
: tls_version_(tls_version) {}
- static const char* CaCertPath() {
- return "src/core/tsi/test_creds/ca.pem";
- }
+ static const char* CaCertPath() { return "src/core/tsi/test_creds/ca.pem"; }
static const char* CertPath() {
return "src/core/tsi/test_creds/server1.pem";
}
- static const char* KeyPath() {
- return "src/core/tsi/test_creds/server1.key";
- }
+ static const char* KeyPath() { return "src/core/tsi/test_creds/server1.key"; }
private:
grpc_core::ChannelArgs MutateClientArgs(
diff --git a/test/core/end2end/fixtures/h2_ssl_tls_common.h b/test/core/end2end/fixtures/h2_ssl_tls_common.h
index d2f068e..2337dd8 100644
--- a/test/core/end2end/fixtures/h2_ssl_tls_common.h
+++ b/test/core/end2end/fixtures/h2_ssl_tls_common.h
@@ -37,9 +37,7 @@
explicit SslTlsFixture(grpc_tls_version tls_version)
: tls_version_(tls_version) {}
- static const char* CaCertPath() {
- return "src/core/tsi/test_creds/ca.pem";
- }
+ static const char* CaCertPath() { return "src/core/tsi/test_creds/ca.pem"; }
static const char* ServerCertPath() {
return "src/core/tsi/test_creds/server1.pem";
}
diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h
index ca49a08..236f251 100644
--- a/test/core/end2end/fixtures/sockpair_fixture.h
+++ b/test/core/end2end/fixtures/sockpair_fixture.h
@@ -17,10 +17,10 @@
#include <utility>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc
index 53c80b0..7b2d417 100644
--- a/test/core/end2end/h2_ssl_cert_test.cc
+++ b/test/core/end2end/h2_ssl_cert_test.cc
@@ -23,9 +23,9 @@
#include <memory>
#include <string>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc
index 31bc1f7..b90f681 100644
--- a/test/core/end2end/tests/call_creds.cc
+++ b/test/core/end2end/tests/call_creds.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc
index c0c2be3..e56b1de 100644
--- a/test/core/end2end/tests/call_host_override.cc
+++ b/test/core/end2end/tests/call_host_override.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc
index d379f92..c5e68a1 100644
--- a/test/core/end2end/tests/cancel_after_accept.cc
+++ b/test/core/end2end/tests/cancel_after_accept.cc
@@ -18,9 +18,9 @@
#include <memory>
+#include "absl/strings/str_cat.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/str_cat.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc
index c9ed0ba..7c581dd 100644
--- a/test/core/end2end/tests/cancel_after_round_trip.cc
+++ b/test/core/end2end/tests/cancel_after_round_trip.cc
@@ -18,9 +18,9 @@
#include <memory>
+#include "absl/strings/str_cat.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/str_cat.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc
index 0809361..bb8cfe6 100644
--- a/test/core/end2end/tests/compressed_payload.cc
+++ b/test/core/end2end/tests/compressed_payload.cc
@@ -22,8 +22,8 @@
#include <string>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/compression.h>
#include <grpc/grpc.h>
diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc
index c3d6d8b..8bd53f3 100644
--- a/test/core/end2end/tests/default_host.cc
+++ b/test/core/end2end/tests/default_host.cc
@@ -18,9 +18,9 @@
#include <memory>
+#include "absl/types/optional.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/types/optional.h"
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc
index 4887965..7515074 100644
--- a/test/core/end2end/tests/filter_causes_close.cc
+++ b/test/core/end2end/tests/filter_causes_close.cc
@@ -21,8 +21,8 @@
#include <memory>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/filter_context.cc b/test/core/end2end/tests/filter_context.cc
index c8dcb4c..8156384 100644
--- a/test/core/end2end/tests/filter_context.cc
+++ b/test/core/end2end/tests/filter_context.cc
@@ -19,8 +19,8 @@
#include <initializer_list>
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/status.h>
#include <grpc/support/log.h>
diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc
index a440796..a640beb 100644
--- a/test/core/end2end/tests/filter_init_fails.cc
+++ b/test/core/end2end/tests/filter_init_fails.cc
@@ -19,10 +19,10 @@
#include <memory>
#include <utility>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc
index 94c29c6..f5b94af 100644
--- a/test/core/end2end/tests/filtered_metadata.cc
+++ b/test/core/end2end/tests/filtered_metadata.cc
@@ -18,9 +18,9 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc
index b4dd267..6421b24 100644
--- a/test/core/end2end/tests/grpc_authz.cc
+++ b/test/core/end2end/tests/grpc_authz.cc
@@ -14,8 +14,8 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc
index 62dd635..465de04 100644
--- a/test/core/end2end/tests/hpack_size.cc
+++ b/test/core/end2end/tests/hpack_size.cc
@@ -21,9 +21,9 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc
index 02a2c14..d2fc0ea 100644
--- a/test/core/end2end/tests/http2_stats.cc
+++ b/test/core/end2end/tests/http2_stats.cc
@@ -17,12 +17,12 @@
#include <string>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/status.h>
#include <grpc/support/log.h>
diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc
index 6329b2b..64b2aa0 100644
--- a/test/core/end2end/tests/keepalive_timeout.cc
+++ b/test/core/end2end/tests/keepalive_timeout.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc
index 3868f75..1fd5285 100644
--- a/test/core/end2end/tests/max_connection_idle.cc
+++ b/test/core/end2end/tests/max_connection_idle.cc
@@ -18,9 +18,9 @@
#include <memory>
+#include "absl/types/optional.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/types/optional.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc
index c9727c8..774d7bf 100644
--- a/test/core/end2end/tests/no_logging.cc
+++ b/test/core/end2end/tests/no_logging.cc
@@ -22,10 +22,10 @@
#include <string>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc
index ef16a22..1de1115 100644
--- a/test/core/end2end/tests/proxy_auth.cc
+++ b/test/core/end2end/tests/proxy_auth.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc
index 2ece5b5..5a95a90 100644
--- a/test/core/end2end/tests/request_with_flags.cc
+++ b/test/core/end2end/tests/request_with_flags.cc
@@ -22,8 +22,8 @@
#include <map>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/byte_buffer.h>
#include <grpc/grpc.h>
diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc
index 32dfa5e..acf4c10 100644
--- a/test/core/end2end/tests/resource_quota_server.cc
+++ b/test/core/end2end/tests/resource_quota_server.cc
@@ -21,8 +21,8 @@
#include <algorithm>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc
index 9b6c59d..ad9d875 100644
--- a/test/core/end2end/tests/retry.cc
+++ b/test/core/end2end/tests/retry.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc
index 9f85c07..1960653 100644
--- a/test/core/end2end/tests/retry_cancel_during_delay.cc
+++ b/test/core/end2end/tests/retry_cancel_during_delay.cc
@@ -16,9 +16,9 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
index fc27d8a..85948b2 100644
--- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
+++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
@@ -19,10 +19,10 @@
#include <memory>
#include <new>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc
index 1317d73..5944f2b 100644
--- a/test/core/end2end/tests/retry_cancellation.cc
+++ b/test/core/end2end/tests/retry_cancellation.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc
index de42d17..dc59d38 100644
--- a/test/core/end2end/tests/retry_disabled.cc
+++ b/test/core/end2end/tests/retry_disabled.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
index 5b54370..3a0b681 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
@@ -16,8 +16,8 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
index f9aa094..9d1382f 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
index 43568c4..1d6669c 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
@@ -18,8 +18,8 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc
index ed42632..b711a9a 100644
--- a/test/core/end2end/tests/retry_lb_drop.cc
+++ b/test/core/end2end/tests/retry_lb_drop.cc
@@ -19,10 +19,10 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc
index 9017ce7..bb015ed 100644
--- a/test/core/end2end/tests/retry_lb_fail.cc
+++ b/test/core/end2end/tests/retry_lb_fail.cc
@@ -17,8 +17,8 @@
#include <atomic>
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc
index aee4735..ce09e2a 100644
--- a/test/core/end2end/tests/retry_non_retriable_status.cc
+++ b/test/core/end2end/tests/retry_non_retriable_status.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
index b1c506a..55bd048 100644
--- a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
+++ b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
index 440baee..9d06d0b 100644
--- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
+++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
@@ -16,9 +16,9 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
index 590f87e..bcee49d 100644
--- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
+++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
@@ -16,9 +16,9 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc
index 5525c06..9738cd5 100644
--- a/test/core/end2end/tests/retry_recv_initial_metadata.cc
+++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_recv_message.cc b/test/core/end2end/tests/retry_recv_message.cc
index 662f573..bee892a 100644
--- a/test/core/end2end/tests/retry_recv_message.cc
+++ b/test/core/end2end/tests/retry_recv_message.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc
index 95c5695..74e5f98 100644
--- a/test/core/end2end/tests/retry_recv_message_replay.cc
+++ b/test/core/end2end/tests/retry_recv_message_replay.cc
@@ -19,9 +19,9 @@
#include <memory>
#include <new>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
index 177be20..8a277ff 100644
--- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
+++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
@@ -17,9 +17,9 @@
#include <memory>
#include <new>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
index a9755ba..5958580 100644
--- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
+++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
@@ -18,8 +18,8 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/slice.h>
diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc
index 002b618..3bb2715 100644
--- a/test/core/end2end/tests/retry_send_op_fails.cc
+++ b/test/core/end2end/tests/retry_send_op_fails.cc
@@ -19,9 +19,9 @@
#include <memory>
#include <new>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc
index 65af813..dff07f9 100644
--- a/test/core/end2end/tests/retry_server_pushback_delay.cc
+++ b/test/core/end2end/tests/retry_server_pushback_delay.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc
index 4cd12e2..ecbac8e 100644
--- a/test/core/end2end/tests/retry_server_pushback_disabled.cc
+++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc
index fc4848e..d21dd51 100644
--- a/test/core/end2end/tests/retry_streaming.cc
+++ b/test/core/end2end/tests/retry_streaming.cc
@@ -18,9 +18,9 @@
#include <string>
+#include "absl/types/optional.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/types/optional.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc
index 40201f1..ecb4208 100644
--- a/test/core/end2end/tests/retry_streaming_after_commit.cc
+++ b/test/core/end2end/tests/retry_streaming_after_commit.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
index 8f4c05a..6870ec0 100644
--- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
+++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_throttled.cc b/test/core/end2end/tests/retry_throttled.cc
index ade56b0..52415d6 100644
--- a/test/core/end2end/tests/retry_throttled.cc
+++ b/test/core/end2end/tests/retry_throttled.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc
index c0278bf..a51a9ab 100644
--- a/test/core/end2end/tests/retry_too_many_attempts.cc
+++ b/test/core/end2end/tests/retry_too_many_attempts.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc
index 8829a4d..98d3f74 100644
--- a/test/core/end2end/tests/retry_transparent_goaway.cc
+++ b/test/core/end2end/tests/retry_transparent_goaway.cc
@@ -17,9 +17,9 @@
#include <memory>
#include <new>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
index aef102c..ceb3740 100644
--- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
+++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
@@ -16,8 +16,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
index a957d56..8754206 100644
--- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
+++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
@@ -19,9 +19,9 @@
#include <memory>
#include <new>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/retry_unref_before_recv.cc b/test/core/end2end/tests/retry_unref_before_recv.cc
index d3f7f8b..c6503de 100644
--- a/test/core/end2end/tests/retry_unref_before_recv.cc
+++ b/test/core/end2end/tests/retry_unref_before_recv.cc
@@ -16,8 +16,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/status.h>
diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc
index 555079c..359489f 100644
--- a/test/core/end2end/tests/simple_request.cc
+++ b/test/core/end2end/tests/simple_request.cc
@@ -22,10 +22,10 @@
#include <memory>
#include <string>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/strings/match.h"
#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/status.h>
#include <grpc/support/log.h>
diff --git a/test/core/event_engine/cf/cf_engine_test.cc b/test/core/event_engine/cf/cf_engine_test.cc
index 66abfbc..c7ea9a1 100644
--- a/test/core/event_engine/cf/cf_engine_test.cc
+++ b/test/core/event_engine/cf/cf_engine_test.cc
@@ -18,10 +18,10 @@
#include <thread>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/event_engine/common_closures_test.cc b/test/core/event_engine/common_closures_test.cc
index 2ef2947..c1a184a 100644
--- a/test/core/event_engine/common_closures_test.cc
+++ b/test/core/event_engine/common_closures_test.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
+#include "gtest/gtest.h"
#include "src/core/lib/gprpp/notification.h"
diff --git a/test/core/event_engine/default_engine_methods_test.cc b/test/core/event_engine/default_engine_methods_test.cc
index 67daca2..6ec6331 100644
--- a/test/core/event_engine/default_engine_methods_test.cc
+++ b/test/core/event_engine/default_engine_methods_test.cc
@@ -18,12 +18,12 @@
#include <thread>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/endpoint_config.h>
#include <grpc/event_engine/event_engine.h>
diff --git a/test/core/event_engine/endpoint_config_test.cc b/test/core/event_engine/endpoint_config_test.cc
index 7441cf4..329f09e 100644
--- a/test/core/event_engine/endpoint_config_test.cc
+++ b/test/core/event_engine/endpoint_config_test.cc
@@ -15,8 +15,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc
index ea991f4..d299a44 100644
--- a/test/core/event_engine/forkable_test.cc
+++ b/test/core/event_engine/forkable_test.cc
@@ -25,8 +25,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
index daaa8ce..2279d41 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
@@ -18,8 +18,8 @@
#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
-#include "gtest/gtest.h"
#include "absl/synchronization/notification.h"
+#include "gtest/gtest.h"
#include "src/core/lib/gprpp/time.h"
diff --git a/test/core/event_engine/mock_event_engine.h b/test/core/event_engine/mock_event_engine.h
index 1e872fb..62266bd 100644
--- a/test/core/event_engine/mock_event_engine.h
+++ b/test/core/event_engine/mock_event_engine.h
@@ -17,10 +17,10 @@
#include <memory>
-#include "gmock/gmock.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gmock/gmock.h"
#include <grpc/event_engine/endpoint_config.h>
#include <grpc/event_engine/event_engine.h>
diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc
index 3f3990f..927b4ec 100644
--- a/test/core/event_engine/posix/event_poller_posix_test.cc
+++ b/test/core/event_engine/posix/event_poller_posix_test.cc
@@ -22,12 +22,12 @@
#include <memory>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_split.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc
index bd09a59..c00ac1c 100644
--- a/test/core/event_engine/posix/lock_free_event_test.cc
+++ b/test/core/event_engine/posix/lock_free_event_test.cc
@@ -20,10 +20,10 @@
#include <benchmark/benchmark.h>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/event_engine/posix/log_too_many_open_files_test.cc b/test/core/event_engine/posix/log_too_many_open_files_test.cc
index 2708ccf..2ff61dd 100644
--- a/test/core/event_engine/posix/log_too_many_open_files_test.cc
+++ b/test/core/event_engine/posix/log_too_many_open_files_test.cc
@@ -17,10 +17,10 @@
#include <string>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
#include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc
index 72eb349..d3cf0bf 100644
--- a/test/core/event_engine/posix/posix_endpoint_test.cc
+++ b/test/core/event_engine/posix/posix_endpoint_test.cc
@@ -23,11 +23,11 @@
#include <type_traits>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_split.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
index d098fbf..0e7a650 100644
--- a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
+++ b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
@@ -19,10 +19,10 @@
#include <list>
#include <string>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
diff --git a/test/core/event_engine/posix/posix_event_engine_connect_test.cc b/test/core/event_engine/posix/posix_event_engine_connect_test.cc
index 6e736d9..e436e77 100644
--- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc
+++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc
@@ -26,12 +26,12 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/memory/memory.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
index 7188898..d958b19 100644
--- a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
+++ b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
@@ -17,8 +17,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/event_engine/posix/timer_list_test.cc b/test/core/event_engine/posix/timer_list_test.cc
index 77f23f9..4d77f2a 100644
--- a/test/core/event_engine/posix/timer_list_test.cc
+++ b/test/core/event_engine/posix/timer_list_test.cc
@@ -20,9 +20,9 @@
#include <limits>
#include <vector>
+#include "absl/types/optional.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/types/optional.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/support/time.h>
diff --git a/test/core/event_engine/posix/timer_manager_test.cc b/test/core/event_engine/posix/timer_manager_test.cc
index b0c52c6..ad30ab4 100644
--- a/test/core/event_engine/posix/timer_manager_test.cc
+++ b/test/core/event_engine/posix/timer_manager_test.cc
@@ -18,10 +18,10 @@
#include <memory>
#include <random>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
diff --git a/test/core/event_engine/posix/wakeup_fd_posix_test.cc b/test/core/event_engine/posix/wakeup_fd_posix_test.cc
index 8e76578..b9872ee 100644
--- a/test/core/event_engine/posix/wakeup_fd_posix_test.cc
+++ b/test/core/event_engine/posix/wakeup_fd_posix_test.cc
@@ -16,8 +16,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h"
#include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
diff --git a/test/core/event_engine/tcp_socket_utils_test.cc b/test/core/event_engine/tcp_socket_utils_test.cc
index c7b9186..d3b114d 100644
--- a/test/core/event_engine/tcp_socket_utils_test.cc
+++ b/test/core/event_engine/tcp_socket_utils_test.cc
@@ -38,9 +38,9 @@
#include <sys/un.h>
#endif
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/support/log.h>
diff --git a/test/core/event_engine/test_suite/tests/client_test.cc b/test/core/event_engine/test_suite/tests/client_test.cc
index cd3befc..7071973 100644
--- a/test/core/event_engine/test_suite/tests/client_test.cc
+++ b/test/core/event_engine/test_suite/tests/client_test.cc
@@ -22,12 +22,12 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc
index f7d0b68..4e585b5 100644
--- a/test/core/event_engine/test_suite/tests/dns_test.cc
+++ b/test/core/event_engine/test_suite/tests/dns_test.cc
@@ -24,14 +24,14 @@
#include <tuple>
#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_join.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
diff --git a/test/core/event_engine/test_suite/tests/server_test.cc b/test/core/event_engine/test_suite/tests/server_test.cc
index 7052926..bd88a13 100644
--- a/test/core/event_engine/test_suite/tests/server_test.cc
+++ b/test/core/event_engine/test_suite/tests/server_test.cc
@@ -22,12 +22,12 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/event_engine/test_suite/tests/timer_test.cc b/test/core/event_engine/test_suite/tests/timer_test.cc
index 86b54d1..d0ad5fd 100644
--- a/test/core/event_engine/test_suite/tests/timer_test.cc
+++ b/test/core/event_engine/test_suite/tests/timer_test.cc
@@ -22,14 +22,14 @@
#include <utility>
#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/functional/any_invocable.h"
#include "absl/functional/bind_front.h"
#include "absl/functional/function_ref.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/support/log.h>
diff --git a/test/core/event_engine/thread_pool_test.cc b/test/core/event_engine/thread_pool_test.cc
index 43ceaec..59418f4 100644
--- a/test/core/event_engine/thread_pool_test.cc
+++ b/test/core/event_engine/thread_pool_test.cc
@@ -20,9 +20,9 @@
#include <thread>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/thd_id.h>
diff --git a/test/core/event_engine/work_queue/basic_work_queue_test.cc b/test/core/event_engine/work_queue/basic_work_queue_test.cc
index 1b6dc33..668c0ed 100644
--- a/test/core/event_engine/work_queue/basic_work_queue_test.cc
+++ b/test/core/event_engine/work_queue/basic_work_queue_test.cc
@@ -18,8 +18,8 @@
#include <thread>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
diff --git a/test/core/experiments/experiments_tag_test.cc b/test/core/experiments/experiments_tag_test.cc
index eb384fa..bc1bfa4 100644
--- a/test/core/experiments/experiments_tag_test.cc
+++ b/test/core/experiments/experiments_tag_test.cc
@@ -16,12 +16,12 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_split.h"
#include "absl/strings/string_view.h"
#include "absl/strings/strip.h"
+#include "gtest/gtest.h"
#include "src/core/lib/config/config_vars.h"
#include "src/core/lib/experiments/config.h"
diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
index 1ac6ac6..9961d7f 100644
--- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
+++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
@@ -18,11 +18,11 @@
#include <memory>
#include <string>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_audit_logging.h>
diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc
index c3267a6..4596cde 100644
--- a/test/core/filters/client_auth_filter_test.cc
+++ b/test/core/filters/client_auth_filter_test.cc
@@ -15,11 +15,11 @@
#include <string>
#include <utility>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/filters/client_authority_filter_test.cc b/test/core/filters/client_authority_filter_test.cc
index e9f49c6..cdb99d9 100644
--- a/test/core/filters/client_authority_filter_test.cc
+++ b/test/core/filters/client_authority_filter_test.cc
@@ -16,10 +16,10 @@
#include <memory>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc
index 0b3734a..cb2ec16 100644
--- a/test/core/filters/filter_test.cc
+++ b/test/core/filters/filter_test.cc
@@ -19,11 +19,11 @@
#include <memory>
#include <queue>
-#include "gtest/gtest.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h
index 0d022f9..796b0a2 100644
--- a/test/core/filters/filter_test.h
+++ b/test/core/filters/filter_test.h
@@ -27,11 +27,11 @@
#include <gtest/gtest.h>
-#include "gmock/gmock.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/escaping.h"
#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/filters/filter_test_test.cc b/test/core/filters/filter_test_test.cc
index 1b68844..565914d 100644
--- a/test/core/filters/filter_test_test.cc
+++ b/test/core/filters/filter_test_test.cc
@@ -19,9 +19,9 @@
#include <type_traits>
#include <utility>
+#include "absl/status/statusor.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/status/statusor.h"
#include <grpc/compression.h>
diff --git a/test/core/gprpp/directory_reader_test.cc b/test/core/gprpp/directory_reader_test.cc
index 2b8cf6f..3aa4c9d 100644
--- a/test/core/gprpp/directory_reader_test.cc
+++ b/test/core/gprpp/directory_reader_test.cc
@@ -19,9 +19,9 @@
#include <string>
#include <vector>
+#include "absl/strings/string_view.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/string_view.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/gprpp/examine_stack_test.cc b/test/core/gprpp/examine_stack_test.cc
index 30f097a..bb3f7f3 100644
--- a/test/core/gprpp/examine_stack_test.cc
+++ b/test/core/gprpp/examine_stack_test.cc
@@ -18,10 +18,10 @@
#include "src/core/lib/gprpp/examine_stack.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/debugging/stacktrace.h"
#include "absl/debugging/symbolize.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/gprpp/ref_counted_ptr_test.cc b/test/core/gprpp/ref_counted_ptr_test.cc
index a66e97b..fb9e3f0 100644
--- a/test/core/gprpp/ref_counted_ptr_test.cc
+++ b/test/core/gprpp/ref_counted_ptr_test.cc
@@ -20,8 +20,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/container/flat_hash_set.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/gprpp/status_helper_test.cc b/test/core/gprpp/status_helper_test.cc
index 2d55e26..60c257f 100644
--- a/test/core/gprpp/status_helper_test.cc
+++ b/test/core/gprpp/status_helper_test.cc
@@ -18,13 +18,13 @@
#include <stddef.h>
-#include "gmock/gmock.h"
-#include "google/rpc/status.upb.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/time/civil_time.h"
#include "absl/time/clock.h"
+#include "gmock/gmock.h"
+#include "google/rpc/status.upb.h"
+#include "gtest/gtest.h"
#include "upb/upb.hpp"
namespace grpc_core {
diff --git a/test/core/gprpp/table_test.cc b/test/core/gprpp/table_test.cc
index 306d690..9c9ba50 100644
--- a/test/core/gprpp/table_test.cc
+++ b/test/core/gprpp/table_test.cc
@@ -18,8 +18,8 @@
#include <tuple>
#include <variant>
-#include "gtest/gtest.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
namespace grpc_core {
namespace testing {
diff --git a/test/core/gprpp/time_util_test.cc b/test/core/gprpp/time_util_test.cc
index 2e72eea..09a6650 100644
--- a/test/core/gprpp/time_util_test.cc
+++ b/test/core/gprpp/time_util_test.cc
@@ -19,8 +19,8 @@
#include <algorithm>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/support/time.h>
diff --git a/test/core/gprpp/unique_type_name_test.cc b/test/core/gprpp/unique_type_name_test.cc
index c22ce4f..bce147e 100644
--- a/test/core/gprpp/unique_type_name_test.cc
+++ b/test/core/gprpp/unique_type_name_test.cc
@@ -17,9 +17,9 @@
#include <iosfwd>
#include <map>
+#include "absl/strings/str_format.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/str_format.h"
namespace grpc_core {
diff --git a/test/core/gprpp/work_serializer_test.cc b/test/core/gprpp/work_serializer_test.cc
index 7ace55a..918c845 100644
--- a/test/core/gprpp/work_serializer_test.cc
+++ b/test/core/gprpp/work_serializer_test.cc
@@ -25,11 +25,11 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/synchronization/barrier.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/sync.h>
diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc
index aa4fc9e..45e39c1 100644
--- a/test/core/handshake/client_ssl.cc
+++ b/test/core/handshake/client_ssl.cc
@@ -23,8 +23,8 @@
#include <openssl/crypto.h>
#include <openssl/evp.h>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
+#include "gtest/gtest.h"
#include <grpc/impl/channel_arg_names.h>
#include <grpc/slice.h>
diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc
index 22413d8..ebe8995 100644
--- a/test/core/http/parser_test.cc
+++ b/test/core/http/parser_test.cc
@@ -23,9 +23,9 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
#include <grpc/support/alloc.h>
diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc
index a30ded86..0f3c864 100644
--- a/test/core/json/json_object_loader_test.cc
+++ b/test/core/json/json_object_loader_test.cc
@@ -16,9 +16,9 @@
#include <cstdint>
+#include "absl/status/status.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/status/status.h"
#include <grpc/support/json.h>
diff --git a/test/core/json/json_test.cc b/test/core/json/json_test.cc
index 2b33b74..de64590 100644
--- a/test/core/json/json_test.cc
+++ b/test/core/json/json_test.cc
@@ -22,12 +22,12 @@
#include <string>
#include <utility>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/matchers/matchers_test.cc b/test/core/matchers/matchers_test.cc
index 3bceb8c..75c6b49 100644
--- a/test/core/matchers/matchers_test.cc
+++ b/test/core/matchers/matchers_test.cc
@@ -14,8 +14,8 @@
#include "src/core/lib/matchers/matchers.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
namespace grpc_core {
diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc
index 28ca672..5b178b6 100644
--- a/test/core/memory_usage/memory_usage_test.cc
+++ b/test/core/memory_usage/memory_usage_test.cc
@@ -29,7 +29,6 @@
#include <utility>
#include <vector>
-#include "google/protobuf/wrappers.pb.h"
#include "absl/algorithm/container.h"
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
@@ -37,6 +36,7 @@
#include "absl/strings/str_join.h"
#include "absl/strings/str_split.h"
#include "absl/strings/string_view.h"
+#include "google/protobuf/wrappers.pb.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc
index cdc862d..03447db 100644
--- a/test/core/message_size/message_size_service_config_test.cc
+++ b/test/core/message_size/message_size_service_config_test.cc
@@ -18,9 +18,9 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/slice.h>
diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc
index 120308d..306105d 100644
--- a/test/core/promise/event_engine_wakeup_scheduler_test.cc
+++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
index fea4577..27d1c49 100644
--- a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
+++ b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include "src/core/lib/promise/activity.h"
#include "src/core/lib/promise/poll.h"
diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc
index 06cdc65..087489b 100644
--- a/test/core/promise/inter_activity_latch_test.cc
+++ b/test/core/promise/inter_activity_latch_test.cc
@@ -14,8 +14,8 @@
#include "src/core/lib/promise/inter_activity_latch.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/promise/inter_activity_pipe_test.cc b/test/core/promise/inter_activity_pipe_test.cc
index 1948036..dffc796 100644
--- a/test/core/promise/inter_activity_pipe_test.cc
+++ b/test/core/promise/inter_activity_pipe_test.cc
@@ -16,8 +16,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include "src/core/lib/promise/seq.h"
#include "test/core/promise/test_wakeup_schedulers.h"
diff --git a/test/core/promise/latch_test.cc b/test/core/promise/latch_test.cc
index 72ed9e9..b1af24b 100644
--- a/test/core/promise/latch_test.cc
+++ b/test/core/promise/latch_test.cc
@@ -17,9 +17,9 @@
#include <tuple>
#include <utility>
+#include "absl/status/status.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/status/status.h"
#include "src/core/lib/promise/activity.h"
#include "src/core/lib/promise/join.h"
diff --git a/test/core/promise/map_test.cc b/test/core/promise/map_test.cc
index 870a92a..c153327 100644
--- a/test/core/promise/map_test.cc
+++ b/test/core/promise/map_test.cc
@@ -16,8 +16,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
+#include "gtest/gtest.h"
#include "src/core/lib/promise/promise.h"
diff --git a/test/core/promise/mpsc_test.cc b/test/core/promise/mpsc_test.cc
index e28b1f6..38baa68 100644
--- a/test/core/promise/mpsc_test.cc
+++ b/test/core/promise/mpsc_test.cc
@@ -17,9 +17,9 @@
#include <memory>
#include <string>
+#include "absl/types/optional.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/types/optional.h"
#include <grpc/support/log.h>
diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc
index 94d52b6..551443a 100644
--- a/test/core/promise/party_test.cc
+++ b/test/core/promise/party_test.cc
@@ -22,8 +22,8 @@
#include <thread>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc
index 7f16e43..abc7e44 100644
--- a/test/core/promise/pipe_test.cc
+++ b/test/core/promise/pipe_test.cc
@@ -18,10 +18,10 @@
#include <tuple>
#include <utility>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/functional/function_ref.h"
#include "absl/status/status.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/memory_allocator.h>
#include <grpc/grpc.h>
diff --git a/test/core/promise/promise_factory_test.cc b/test/core/promise/promise_factory_test.cc
index 2bcadcd..3690d78 100644
--- a/test/core/promise/promise_factory_test.cc
+++ b/test/core/promise/promise_factory_test.cc
@@ -14,8 +14,8 @@
#include "src/core/lib/promise/detail/promise_factory.h"
-#include "gtest/gtest.h"
#include "absl/functional/bind_front.h"
+#include "gtest/gtest.h"
#include "src/core/lib/promise/poll.h"
diff --git a/test/core/promise/promise_mutex_test.cc b/test/core/promise/promise_mutex_test.cc
index 87f798e..9ef2c77 100644
--- a/test/core/promise/promise_mutex_test.cc
+++ b/test/core/promise/promise_mutex_test.cc
@@ -17,8 +17,8 @@
#include <memory>
#include <optional>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include "src/core/lib/promise/activity.h"
#include "src/core/lib/promise/join.h"
diff --git a/test/core/promise/try_join_test.cc b/test/core/promise/try_join_test.cc
index 9a21e95..63814b5 100644
--- a/test/core/promise/try_join_test.cc
+++ b/test/core/promise/try_join_test.cc
@@ -18,8 +18,8 @@
#include <memory>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/utility/utility.h"
+#include "gtest/gtest.h"
namespace grpc_core {
diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc
index 76833f5..cb54ccf 100644
--- a/test/core/promise/wait_for_callback_test.cc
+++ b/test/core/promise/wait_for_callback_test.cc
@@ -14,8 +14,8 @@
#include "src/core/lib/promise/wait_for_callback.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include "src/core/lib/gprpp/notification.h"
#include "src/core/lib/promise/map.h"
diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc
index c577ae8..2665c5f 100644
--- a/test/core/resolver/endpoint_addresses_test.cc
+++ b/test/core/resolver/endpoint_addresses_test.cc
@@ -20,10 +20,10 @@
#include <set>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc
index 5021121..1e35a10 100644
--- a/test/core/resource_quota/arena_test.cc
+++ b/test/core/resource_quota/arena_test.cc
@@ -28,8 +28,8 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/strings/str_join.h"
+#include "gtest/gtest.h"
#include <grpc/support/sync.h>
#include <grpc/support/time.h>
diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc
index b66aca4..3cae0ee 100644
--- a/test/core/resource_quota/memory_quota_stress_test.cc
+++ b/test/core/resource_quota/memory_quota_stress_test.cc
@@ -24,10 +24,10 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/memory_allocator.h>
#include <grpc/event_engine/memory_request.h>
diff --git a/test/core/security/grpc_authorization_policy_provider_test.cc b/test/core/security/grpc_authorization_policy_provider_test.cc
index 80e737d..f06c9fd 100644
--- a/test/core/security/grpc_authorization_policy_provider_test.cc
+++ b/test/core/security/grpc_authorization_policy_provider_test.cc
@@ -25,13 +25,13 @@
#include "test/core/util/test_config.h"
#include "test/core/util/tls_utils.h"
-#define VALID_POLICY_PATH_1 \
+#define VALID_POLICY_PATH_1 \
"test/core/security/authorization/test_policies/" \
"valid_policy_1.json"
-#define VALID_POLICY_PATH_2 \
+#define VALID_POLICY_PATH_2 \
"test/core/security/authorization/test_policies/" \
"valid_policy_2.json"
-#define INVALID_POLICY_PATH \
+#define INVALID_POLICY_PATH \
"test/core/security/authorization/test_policies/" \
"invalid_policy.json"
diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc
index 501c261..e33742f 100644
--- a/test/core/security/grpc_tls_certificate_provider_test.cc
+++ b/test/core/security/grpc_tls_certificate_provider_test.cc
@@ -36,10 +36,8 @@
#define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"
#define SERVER_CERT_PATH "src/core/tsi/test_creds/server1.pem"
#define SERVER_KEY_PATH "src/core/tsi/test_creds/server1.key"
-#define CA_CERT_PATH_2 \
- "src/core/tsi/test_creds/multi-domain.pem"
-#define SERVER_CERT_PATH_2 \
- "src/core/tsi/test_creds/server0.pem"
+#define CA_CERT_PATH_2 "src/core/tsi/test_creds/multi-domain.pem"
+#define SERVER_CERT_PATH_2 "src/core/tsi/test_creds/server0.pem"
#define SERVER_KEY_PATH_2 "src/core/tsi/test_creds/server0.key"
#define INVALID_PATH "invalid/path"
diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc
index 0f8c1bd..b670822 100644
--- a/test/core/security/grpc_tls_credentials_options_test.cc
+++ b/test/core/security/grpc_tls_credentials_options_test.cc
@@ -38,10 +38,8 @@
#define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"
#define SERVER_CERT_PATH "src/core/tsi/test_creds/server1.pem"
#define SERVER_KEY_PATH "src/core/tsi/test_creds/server1.key"
-#define CA_CERT_PATH_2 \
- "src/core/tsi/test_creds/multi-domain.pem"
-#define SERVER_CERT_PATH_2 \
- "src/core/tsi/test_creds/server0.pem"
+#define CA_CERT_PATH_2 "src/core/tsi/test_creds/multi-domain.pem"
+#define SERVER_CERT_PATH_2 "src/core/tsi/test_creds/server0.pem"
#define SERVER_KEY_PATH_2 "src/core/tsi/test_creds/server0.key"
#define INVALID_PATH "invalid/path"
diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc
index 3b11427..6323fe2 100644
--- a/test/core/security/tls_security_connector_test.cc
+++ b/test/core/security/tls_security_connector_test.cc
@@ -42,13 +42,10 @@
#include "test/core/util/tls_utils.h"
#define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"
-#define CLIENT_CERT_PATH \
- "src/core/tsi/test_creds/multi-domain.pem"
-#define SERVER_CERT_PATH_0 \
- "src/core/tsi/test_creds/server0.pem"
+#define CLIENT_CERT_PATH "src/core/tsi/test_creds/multi-domain.pem"
+#define SERVER_CERT_PATH_0 "src/core/tsi/test_creds/server0.pem"
#define SERVER_KEY_PATH_0 "src/core/tsi/test_creds/server0.key"
-#define SERVER_CERT_PATH_1 \
- "src/core/tsi/test_creds/server1.pem"
+#define SERVER_CERT_PATH_1 "src/core/tsi/test_creds/server1.pem"
#define SERVER_KEY_PATH_1 "src/core/tsi/test_creds/server1.key"
namespace grpc_core {
diff --git a/test/core/server_config_selector/server_config_selector_test.cc b/test/core/server_config_selector/server_config_selector_test.cc
index 67751be..4ed25ae 100644
--- a/test/core/server_config_selector/server_config_selector_test.cc
+++ b/test/core/server_config_selector/server_config_selector_test.cc
@@ -18,8 +18,8 @@
#include "src/core/ext/filters/server_config_selector/server_config_selector.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc
index 12dc3b0..47ec64c 100644
--- a/test/core/service_config/service_config_test.cc
+++ b/test/core/service_config/service_config_test.cc
@@ -21,12 +21,12 @@
#include <memory>
#include <string>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc
index 408c6f8..ecfb49f 100644
--- a/test/core/slice/b64_test.cc
+++ b/test/core/slice/b64_test.cc
@@ -23,8 +23,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/slice.h>
#include <grpc/support/alloc.h>
diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc
index 3c4bc8f..36e509a 100644
--- a/test/core/slice/slice_test.cc
+++ b/test/core/slice/slice_test.cc
@@ -30,8 +30,8 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include <grpc/slice.h>
#include <grpc/support/log.h>
diff --git a/test/core/surface/channel_init_test.cc b/test/core/surface/channel_init_test.cc
index c7d95d8..22fdad1 100644
--- a/test/core/surface/channel_init_test.cc
+++ b/test/core/surface/channel_init_test.cc
@@ -17,8 +17,8 @@
#include <map>
#include <string>
-#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/channel/channel_stack_builder_impl.h"
diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc
index d9114fd..1bf392f 100644
--- a/test/core/surface/completion_queue_test.cc
+++ b/test/core/surface/completion_queue_test.cc
@@ -22,8 +22,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc
index 82569da..7c6afb9 100644
--- a/test/core/surface/completion_queue_threading_test.cc
+++ b/test/core/surface/completion_queue_threading_test.cc
@@ -21,8 +21,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/alloc.h>
diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc
index 1e06001..abf0ac7 100644
--- a/test/core/surface/concurrent_connectivity_test.cc
+++ b/test/core/surface/concurrent_connectivity_test.cc
@@ -23,8 +23,8 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc
index f5bb32b..3f3e460 100644
--- a/test/core/surface/init_test.cc
+++ b/test/core/surface/init_test.cc
@@ -21,9 +21,9 @@
#include <chrono>
#include <memory>
-#include "gtest/gtest.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc
index b22bb85..7d514da 100644
--- a/test/core/surface/lame_client_test.cc
+++ b/test/core/surface/lame_client_test.cc
@@ -20,8 +20,8 @@
#include <memory>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/propagation_bits.h>
diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc
index a2a0ab1..c3a927a 100644
--- a/test/core/surface/server_test.cc
+++ b/test/core/surface/server_test.cc
@@ -22,9 +22,9 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc
index 1a3876f..3b30c4c 100644
--- a/test/core/transport/chaotic_good/client_transport_error_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_error_test.cc
@@ -29,12 +29,12 @@
#include <utility>
#include <vector> // IWYU pragma: keep
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/statusor.h" // IWYU pragma: keep
#include "absl/strings/str_format.h" // IWYU pragma: keep
#include "absl/types/optional.h" // IWYU pragma: keep
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc
index baf437e..86bbf57 100644
--- a/test/core/transport/chaotic_good/client_transport_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_test.cc
@@ -22,12 +22,12 @@
#include <tuple>
#include <vector> // IWYU pragma: keep
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/statusor.h" // IWYU pragma: keep
#include "absl/strings/str_format.h" // IWYU pragma: keep
#include "absl/types/optional.h" // IWYU pragma: keep
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/transport/chaotic_good/frame_header_test.cc b/test/core/transport/chaotic_good/frame_header_test.cc
index 69e2d99..a382315 100644
--- a/test/core/transport/chaotic_good/frame_header_test.cc
+++ b/test/core/transport/chaotic_good/frame_header_test.cc
@@ -17,8 +17,8 @@
#include <cstdint>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
namespace grpc_core {
namespace chaotic_good {
diff --git a/test/core/transport/chaotic_good/frame_test.cc b/test/core/transport/chaotic_good/frame_test.cc
index 3233acb..00908f7 100644
--- a/test/core/transport/chaotic_good/frame_test.cc
+++ b/test/core/transport/chaotic_good/frame_test.cc
@@ -16,10 +16,10 @@
#include <cstdint>
-#include "gtest/gtest.h"
#include "absl/random/random.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
namespace grpc_core {
namespace chaotic_good {
diff --git a/test/core/transport/chttp2/frame_test.cc b/test/core/transport/chttp2/frame_test.cc
index ed2d017..a353d0f 100644
--- a/test/core/transport/chttp2/frame_test.cc
+++ b/test/core/transport/chttp2/frame_test.cc
@@ -18,9 +18,9 @@
#include <initializer_list>
#include <utility>
+#include "absl/status/status.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/status/status.h"
#include "src/core/lib/transport/http2_errors.h"
diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc
index af33a8c..3107db1 100644
--- a/test/core/transport/chttp2/graceful_shutdown_test.cc
+++ b/test/core/transport/chttp2/graceful_shutdown_test.cc
@@ -29,13 +29,13 @@
#include <thread>
#include <tuple>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/impl/channel_arg_names.h>
diff --git a/test/core/transport/chttp2/hpack_parser_table_test.cc b/test/core/transport/chttp2/hpack_parser_table_test.cc
index 9763b4e..c445e1e 100644
--- a/test/core/transport/chttp2/hpack_parser_table_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_table_test.cc
@@ -21,8 +21,8 @@
#include <string>
#include <utility>
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc
index a3f459b..3772d90 100644
--- a/test/core/transport/chttp2/hpack_parser_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_test.cc
@@ -21,14 +21,14 @@
#include <memory>
#include <string>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/cleanup/cleanup.h"
#include "absl/random/random.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/memory_allocator.h>
#include <grpc/grpc.h>
diff --git a/test/core/transport/chttp2/ping_callbacks_test.cc b/test/core/transport/chttp2/ping_callbacks_test.cc
index 07dce91..cd75e96 100644
--- a/test/core/transport/chttp2/ping_callbacks_test.cc
+++ b/test/core/transport/chttp2/ping_callbacks_test.cc
@@ -16,9 +16,9 @@
#include <chrono>
+#include "absl/random/random.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/random/random.h"
#include "src/core/lib/gprpp/crash.h"
#include "test/core/event_engine/mock_event_engine.h"
diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc
index c5f1a22..58f1869 100644
--- a/test/core/transport/chttp2/settings_timeout_test.cc
+++ b/test/core/transport/chttp2/settings_timeout_test.cc
@@ -24,10 +24,10 @@
#include <thread>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
index 3faa39d..0c3aed8 100644
--- a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
+++ b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
@@ -19,9 +19,9 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/byte_buffer.h>
#include <grpc/grpc.h>
diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc
index da1647b..e38160d 100644
--- a/test/core/transport/chttp2/streams_not_seen_test.cc
+++ b/test/core/transport/chttp2/streams_not_seen_test.cc
@@ -30,7 +30,6 @@
#include <thread>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/base/thread_annotations.h"
#include "absl/status/status.h"
#include "absl/strings/match.h"
@@ -38,6 +37,7 @@
#include "absl/strings/string_view.h"
#include "absl/time/time.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc
index 2d9a6d6..f5d8565 100644
--- a/test/core/transport/chttp2/too_many_pings_test.cc
+++ b/test/core/transport/chttp2/too_many_pings_test.cc
@@ -26,11 +26,11 @@
#include <utility>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/time/time.h"
+#include "gtest/gtest.h"
#include <grpc/byte_buffer.h>
#include <grpc/grpc.h>
diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc
index 9819f63..40649c7 100644
--- a/test/core/transport/error_utils_test.cc
+++ b/test/core/transport/error_utils_test.cc
@@ -20,8 +20,8 @@
#include <vector>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
+#include "gtest/gtest.h"
#include "src/core/lib/gprpp/status_helper.h"
#include "src/core/lib/iomgr/error.h"
diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc
index 38fb93a..b269334 100644
--- a/test/core/transport/metadata_map_test.cc
+++ b/test/core/transport/metadata_map_test.cc
@@ -19,9 +19,9 @@
#include <memory>
#include <string>
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/event_engine/memory_allocator.h>
diff --git a/test/core/transport/parsed_metadata_test.cc b/test/core/transport/parsed_metadata_test.cc
index ae01fca..458df65 100644
--- a/test/core/transport/parsed_metadata_test.cc
+++ b/test/core/transport/parsed_metadata_test.cc
@@ -18,9 +18,9 @@
#include <memory>
+#include "absl/strings/numbers.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/numbers.h"
#include <grpc/support/log.h>
diff --git a/test/core/transport/promise_endpoint_test.cc b/test/core/transport/promise_endpoint_test.cc
index 9a0df19..09478d0 100644
--- a/test/core/transport/promise_endpoint_test.cc
+++ b/test/core/transport/promise_endpoint_test.cc
@@ -21,9 +21,9 @@
#include <string>
#include <tuple>
+#include "absl/functional/any_invocable.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/functional/any_invocable.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/event_engine/port.h> // IWYU pragma: keep
diff --git a/test/core/transport/timeout_encoding_test.cc b/test/core/transport/timeout_encoding_test.cc
index 8a00a54..420fd93 100644
--- a/test/core/transport/timeout_encoding_test.cc
+++ b/test/core/transport/timeout_encoding_test.cc
@@ -20,9 +20,9 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/gprpp/time.h"
diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h b/test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h
index 9921962..168e8c6 100644
--- a/test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h
+++ b/test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h
@@ -19,9 +19,8 @@
#ifndef GRPC_TEST_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_SERVICE_API_TEST_LIB_H
#define GRPC_TEST_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_SERVICE_API_TEST_LIB_H
-#include "src/proto/grpc/gcp/handshaker.upb.h"
-
#include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
+#include "src/proto/grpc/gcp/handshaker.upb.h"
///
/// The first part of this file contains function signatures for de-serializing
diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
index 1c8b7c0..10e5341 100644
--- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
@@ -23,7 +23,6 @@
#include <gtest/gtest.h>
-#include "src/proto/grpc/gcp/altscontext.upb.h"
#include "upb/upb.hpp"
#include <grpc/grpc.h>
@@ -35,6 +34,7 @@
#include "src/core/tsi/alts/handshaker/alts_shared_resource.h"
#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h"
#include "src/core/tsi/transport_security_grpc.h"
+#include "src/proto/grpc/gcp/altscontext.upb.h"
#include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc
index 0053ac1..bf1ee64 100644
--- a/test/core/tsi/crl_ssl_transport_security_test.cc
+++ b/test/core/tsi/crl_ssl_transport_security_test.cc
@@ -58,14 +58,10 @@
const char* kSslTsiTestCrlSupportedCrlDirMissingRoot =
"test/core/tsi/test_creds/crl_data/crls_missing_root/";
const char* kSslTsiTestFaultyCrlsDir = "bad_path/";
-const char* kRevokedKeyPath =
- "test/core/tsi/test_creds/crl_data/revoked.key";
-const char* kRevokedCertPath =
- "test/core/tsi/test_creds/crl_data/revoked.pem";
-const char* kValidKeyPath =
- "test/core/tsi/test_creds/crl_data/valid.key";
-const char* kValidCertPath =
- "test/core/tsi/test_creds/crl_data/valid.pem";
+const char* kRevokedKeyPath = "test/core/tsi/test_creds/crl_data/revoked.key";
+const char* kRevokedCertPath = "test/core/tsi/test_creds/crl_data/revoked.pem";
+const char* kValidKeyPath = "test/core/tsi/test_creds/crl_data/valid.key";
+const char* kValidCertPath = "test/core/tsi/test_creds/crl_data/valid.pem";
const char* kRevokedIntermediateKeyPath =
"test/core/tsi/test_creds/crl_data/"
@@ -73,8 +69,7 @@
const char* kRevokedIntermediateCertPath =
"test/core/tsi/test_creds/crl_data/"
"leaf_and_intermediate_chain.pem";
-const char* kRootCrlPath =
- "test/core/tsi/test_creds/crl_data/crls/current.crl";
+const char* kRootCrlPath = "test/core/tsi/test_creds/crl_data/crls/current.crl";
const char* kIntermediateCrlPath =
"test/core/tsi/test_creds/crl_data/crls/intermediate.crl";
diff --git a/test/core/uri/uri_parser_test.cc b/test/core/uri/uri_parser_test.cc
index 265d159..6e3459d 100644
--- a/test/core/uri/uri_parser_test.cc
+++ b/test/core/uri/uri_parser_test.cc
@@ -18,9 +18,9 @@
#include <utility>
+#include "absl/status/status.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/status/status.h"
#include <grpc/grpc.h>
diff --git a/test/core/util/fuzzer_corpus_test.cc b/test/core/util/fuzzer_corpus_test.cc
index 75b8a2e..b79b33e 100644
--- a/test/core/util/fuzzer_corpus_test.cc
+++ b/test/core/util/fuzzer_corpus_test.cc
@@ -26,9 +26,9 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
#include "absl/flags/flag.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include <grpc/slice.h>
#include <grpc/support/alloc.h>
diff --git a/test/core/util/stack_tracer_test.cc b/test/core/util/stack_tracer_test.cc
index 7a15db7..141b551 100644
--- a/test/core/util/stack_tracer_test.cc
+++ b/test/core/util/stack_tracer_test.cc
@@ -20,8 +20,8 @@
#include <string>
-#include "gtest/gtest.h"
#include "absl/strings/match.h"
+#include "gtest/gtest.h"
#include <grpc/support/log.h>
diff --git a/test/core/xds/file_watcher_certificate_provider_factory_test.cc b/test/core/xds/file_watcher_certificate_provider_factory_test.cc
index 8c8dfab..fd839ba 100644
--- a/test/core/xds/file_watcher_certificate_provider_factory_test.cc
+++ b/test/core/xds/file_watcher_certificate_provider_factory_test.cc
@@ -20,10 +20,10 @@
#include <utility>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc
index 698989d..abfc738 100644
--- a/test/core/xds/xds_audit_logger_registry_test.cc
+++ b/test/core/xds/xds_audit_logger_registry_test.cc
@@ -23,13 +23,13 @@
#include <google/protobuf/any.pb.h>
-#include "google/protobuf/struct.pb.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#include "envoy/config/rbac/v3/rbac.upb.h"
+#include "google/protobuf/struct.pb.h"
+#include "gtest/gtest.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc
index 183ff69..e881b9f 100644
--- a/test/core/xds/xds_bootstrap_test.cc
+++ b/test/core/xds/xds_bootstrap_test.cc
@@ -23,12 +23,12 @@
#include <string>
#include <utility>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc
index b735cc8..f2090e6 100644
--- a/test/core/xds/xds_certificate_provider_test.cc
+++ b/test/core/xds/xds_certificate_provider_test.cc
@@ -18,10 +18,10 @@
#include "src/core/ext/xds/xds_certificate_provider.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc
index a07acac..4f75e4e 100644
--- a/test/core/xds/xds_client_test.cc
+++ b/test/core/xds/xds_client_test.cc
@@ -31,12 +31,12 @@
#include <google/protobuf/any.pb.h>
#include <google/protobuf/struct.pb.h>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
#include "absl/time/time.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "upb/reflection/def.h"
#include <grpc/grpc.h>
diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc
index 3e937fc..5fd5d20 100644
--- a/test/core/xds/xds_cluster_resource_type_test.cc
+++ b/test/core/xds/xds_cluster_resource_type_test.cc
@@ -22,13 +22,13 @@
#include <google/protobuf/duration.pb.h>
#include <google/protobuf/wrappers.pb.h>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc
index 9deb415..c5b0fbd 100644
--- a/test/core/xds/xds_common_types_test.cc
+++ b/test/core/xds/xds_common_types_test.cc
@@ -24,14 +24,14 @@
#include <google/protobuf/struct.pb.h>
#include <google/protobuf/wrappers.pb.h>
-#include "gmock/gmock.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
+#include "gmock/gmock.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/duration.upb.h"
+#include "gtest/gtest.h"
#include "re2/re2.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc
index a60cc36..a7e668c 100644
--- a/test/core/xds/xds_endpoint_resource_type_test.cc
+++ b/test/core/xds/xds_endpoint_resource_type_test.cc
@@ -25,11 +25,11 @@
#include <google/protobuf/wrappers.pb.h>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/types/optional.h"
+#include "gtest/gtest.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc
index 707b1dd..85c0fcf 100644
--- a/test/core/xds/xds_http_filters_test.cc
+++ b/test/core/xds/xds_http_filters_test.cc
@@ -24,11 +24,11 @@
#include <google/protobuf/duration.pb.h>
#include <google/protobuf/wrappers.pb.h>
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "absl/strings/strip.h"
#include "absl/types/variant.h"
+#include "gtest/gtest.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc
index d580eed..b6b10dd 100644
--- a/test/core/xds/xds_lb_policy_registry_test.cc
+++ b/test/core/xds/xds_lb_policy_registry_test.cc
@@ -25,10 +25,10 @@
#include <google/protobuf/struct.pb.h>
#include <google/protobuf/wrappers.pb.h>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc
index c1887ef..9d0459b 100644
--- a/test/core/xds/xds_listener_resource_type_test.cc
+++ b/test/core/xds/xds_listener_resource_type_test.cc
@@ -24,8 +24,6 @@
#include <google/protobuf/duration.pb.h>
#include <google/protobuf/wrappers.pb.h>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@@ -33,6 +31,8 @@
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc
index 8fa57fd..8bd81fb 100644
--- a/test/core/xds/xds_route_config_resource_type_test.cc
+++ b/test/core/xds/xds_route_config_resource_type_test.cc
@@ -27,8 +27,6 @@
#include <google/protobuf/duration.pb.h>
#include <google/protobuf/wrappers.pb.h>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@@ -36,6 +34,8 @@
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "absl/types/variant.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "re2/re2.h"
#include "upb/reflection/def.hpp"
#include "upb/upb.hpp"
diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc
index 728cef0..597d44e 100644
--- a/test/cpp/common/alts_util_test.cc
+++ b/test/cpp/common/alts_util_test.cc
@@ -18,7 +18,6 @@
#include <gtest/gtest.h>
-#include "src/proto/grpc/gcp/altscontext.upb.h"
#include "upb/upb.hpp"
#include <grpcpp/security/alts_context.h>
@@ -27,6 +26,7 @@
#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
#include "src/cpp/common/secure_auth_context.h"
+#include "src/proto/grpc/gcp/altscontext.upb.h"
#include "test/core/util/test_config.h"
#include "test/cpp/util/string_ref_helper.h"
diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc
index b34d357..333d280 100644
--- a/test/cpp/end2end/channelz_service_test.cc
+++ b/test/cpp/end2end/channelz_service_test.cc
@@ -128,16 +128,11 @@
kMtls = 2,
};
-constexpr char kCaCertPath[] =
- "src/core/tsi/test_creds/ca.pem";
-constexpr char kServerCertPath[] =
- "src/core/tsi/test_creds/server1.pem";
-constexpr char kServerKeyPath[] =
- "src/core/tsi/test_creds/server1.key";
-constexpr char kClientCertPath[] =
- "src/core/tsi/test_creds/client.pem";
-constexpr char kClientKeyPath[] =
- "src/core/tsi/test_creds/client.key";
+constexpr char kCaCertPath[] = "src/core/tsi/test_creds/ca.pem";
+constexpr char kServerCertPath[] = "src/core/tsi/test_creds/server1.pem";
+constexpr char kServerKeyPath[] = "src/core/tsi/test_creds/server1.key";
+constexpr char kClientCertPath[] = "src/core/tsi/test_creds/client.pem";
+constexpr char kClientKeyPath[] = "src/core/tsi/test_creds/client.key";
std::string ReadFile(const char* file_path) {
grpc_slice slice;
diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc
index ca0a12f..52ec168 100644
--- a/test/cpp/end2end/crl_provider_test.cc
+++ b/test/cpp/end2end/crl_provider_test.cc
@@ -53,18 +53,12 @@
namespace testing {
namespace {
-const char* kRootPath =
- "test/core/tsi/test_creds/crl_data/ca.pem";
-const char* kRevokedKeyPath =
- "test/core/tsi/test_creds/crl_data/revoked.key";
-const char* kRevokedCertPath =
- "test/core/tsi/test_creds/crl_data/revoked.pem";
-const char* kValidKeyPath =
- "test/core/tsi/test_creds/crl_data/valid.key";
-const char* kValidCertPath =
- "test/core/tsi/test_creds/crl_data/valid.pem";
-const char* kRootCrlPath =
- "test/core/tsi/test_creds/crl_data/crls/current.crl";
+const char* kRootPath = "test/core/tsi/test_creds/crl_data/ca.pem";
+const char* kRevokedKeyPath = "test/core/tsi/test_creds/crl_data/revoked.key";
+const char* kRevokedCertPath = "test/core/tsi/test_creds/crl_data/revoked.pem";
+const char* kValidKeyPath = "test/core/tsi/test_creds/crl_data/valid.key";
+const char* kValidCertPath = "test/core/tsi/test_creds/crl_data/valid.pem";
+const char* kRootCrlPath = "test/core/tsi/test_creds/crl_data/crls/current.crl";
constexpr char kMessage[] = "Hello";
class CrlProviderTest : public ::testing::Test {
diff --git a/test/cpp/end2end/grpc_authz_end2end_test.cc b/test/cpp/end2end/grpc_authz_end2end_test.cc
index 5b1dd4a..8a4d90f 100644
--- a/test/cpp/end2end/grpc_authz_end2end_test.cc
+++ b/test/cpp/end2end/grpc_authz_end2end_test.cc
@@ -42,12 +42,9 @@
namespace testing {
namespace {
-constexpr char kCaCertPath[] =
- "src/core/tsi/test_creds/ca.pem";
-constexpr char kServerCertPath[] =
- "src/core/tsi/test_creds/server1.pem";
-constexpr char kServerKeyPath[] =
- "src/core/tsi/test_creds/server1.key";
+constexpr char kCaCertPath[] = "src/core/tsi/test_creds/ca.pem";
+constexpr char kServerCertPath[] = "src/core/tsi/test_creds/server1.pem";
+constexpr char kServerKeyPath[] = "src/core/tsi/test_creds/server1.key";
constexpr char kClientCertPath[] =
"src/core/tsi/test_creds/client-with-spiffe.pem";
constexpr char kClientKeyPath[] =
diff --git a/test/cpp/end2end/ssl_credentials_test.cc b/test/cpp/end2end/ssl_credentials_test.cc
index 8560e13..b1a51da 100644
--- a/test/cpp/end2end/ssl_credentials_test.cc
+++ b/test/cpp/end2end/ssl_credentials_test.cc
@@ -38,16 +38,11 @@
namespace testing {
namespace {
-constexpr char kCaCertPath[] =
- "src/core/tsi/test_creds/ca.pem";
-constexpr char kServerCertPath[] =
- "src/core/tsi/test_creds/server1.pem";
-constexpr char kServerKeyPath[] =
- "src/core/tsi/test_creds/server1.key";
-constexpr char kClientCertPath[] =
- "src/core/tsi/test_creds/client.pem";
-constexpr char kClientKeyPath[] =
- "src/core/tsi/test_creds/client.key";
+constexpr char kCaCertPath[] = "src/core/tsi/test_creds/ca.pem";
+constexpr char kServerCertPath[] = "src/core/tsi/test_creds/server1.pem";
+constexpr char kServerKeyPath[] = "src/core/tsi/test_creds/server1.key";
+constexpr char kClientCertPath[] = "src/core/tsi/test_creds/client.pem";
+constexpr char kClientKeyPath[] = "src/core/tsi/test_creds/client.key";
constexpr char kMessage[] = "Hello";
std::string ReadFile(const std::string& file_path) {
diff --git a/test/cpp/end2end/tls_credentials_test.cc b/test/cpp/end2end/tls_credentials_test.cc
index 3ea2bfa..a0a78e6 100644
--- a/test/cpp/end2end/tls_credentials_test.cc
+++ b/test/cpp/end2end/tls_credentials_test.cc
@@ -43,12 +43,9 @@
using ::grpc::experimental::ExternalCertificateVerifier;
using ::grpc::experimental::TlsChannelCredentialsOptions;
-constexpr char kCaCertPath[] =
- "src/core/tsi/test_creds/ca.pem";
-constexpr char kServerCertPath[] =
- "src/core/tsi/test_creds/server1.pem";
-constexpr char kServerKeyPath[] =
- "src/core/tsi/test_creds/server1.key";
+constexpr char kCaCertPath[] = "src/core/tsi/test_creds/ca.pem";
+constexpr char kServerCertPath[] = "src/core/tsi/test_creds/server1.pem";
+constexpr char kServerKeyPath[] = "src/core/tsi/test_creds/server1.key";
constexpr char kMessage[] = "Hello";
std::string ReadFile(const std::string& file_path) {
diff --git a/test/cpp/end2end/tls_key_export_test.cc b/test/cpp/end2end/tls_key_export_test.cc
index 46f9b84..67e3e9d 100644
--- a/test/cpp/end2end/tls_key_export_test.cc
+++ b/test/cpp/end2end/tls_key_export_test.cc
@@ -17,11 +17,11 @@
#include <thread> // NOLINT
#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_split.h"
#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc++/grpc++.h>
#include <grpc/grpc.h>
diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc
index e81e188..b664160 100644
--- a/test/cpp/end2end/xds/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test.cc
@@ -141,14 +141,10 @@
using ::grpc_core::testing::ScopedExperimentalEnvVar;
using ::grpc_core::testing::TestAuditLoggerFactory;
-constexpr char kClientCertPath[] =
- "src/core/tsi/test_creds/client.pem";
-constexpr char kClientKeyPath[] =
- "src/core/tsi/test_creds/client.key";
-constexpr char kBadClientCertPath[] =
- "src/core/tsi/test_creds/badclient.pem";
-constexpr char kBadClientKeyPath[] =
- "src/core/tsi/test_creds/badclient.key";
+constexpr char kClientCertPath[] = "src/core/tsi/test_creds/client.pem";
+constexpr char kClientKeyPath[] = "src/core/tsi/test_creds/client.key";
+constexpr char kBadClientCertPath[] = "src/core/tsi/test_creds/badclient.pem";
+constexpr char kBadClientKeyPath[] = "src/core/tsi/test_creds/badclient.key";
// Based on StaticDataCertificateProvider, but provides alternate certificates
// if the certificate name is not empty.
diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc
index 679e3b6..ca04697 100644
--- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc
@@ -355,8 +355,7 @@
// XdsEnd2endTest
//
-const char XdsEnd2endTest::kCaCertPath[] =
- "src/core/tsi/test_creds/ca.pem";
+const char XdsEnd2endTest::kCaCertPath[] = "src/core/tsi/test_creds/ca.pem";
const char XdsEnd2endTest::kServerCertPath[] =
"src/core/tsi/test_creds/server1.pem";
const char XdsEnd2endTest::kServerKeyPath[] =
diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc
index 5544da6..03b62c2 100644
--- a/test/cpp/ext/csm/metadata_exchange_test.cc
+++ b/test/cpp/ext/csm/metadata_exchange_test.cc
@@ -18,13 +18,13 @@
#include "src/cpp/ext/csm/metadata_exchange.h"
+#include "absl/functional/any_invocable.h"
#include "api/include/opentelemetry/metrics/provider.h"
#include "gmock/gmock.h"
#include "google/cloud/opentelemetry/resource_detector.h"
#include "gtest/gtest.h"
#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "absl/functional/any_invocable.h"
#include <grpcpp/grpcpp.h>
diff --git a/test/cpp/ext/filters/census/constant_labels_test.cc b/test/cpp/ext/filters/census/constant_labels_test.cc
index 60b4a2a..5cf0a26 100644
--- a/test/cpp/ext/filters/census/constant_labels_test.cc
+++ b/test/cpp/ext/filters/census/constant_labels_test.cc
@@ -20,12 +20,12 @@
#include <thread> // NOLINT
#include <vector>
+#include "absl/strings/string_view.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "opencensus/stats/stats.h"
#include "opencensus/stats/testing/test_utils.h"
#include "opencensus/tags/tag_map.h"
-#include "absl/strings/string_view.h"
#include <grpc++/grpc++.h>
#include <grpcpp/opencensus.h>
diff --git a/test/cpp/ext/filters/census/library.h b/test/cpp/ext/filters/census/library.h
index dcd799e..a996334 100644
--- a/test/cpp/ext/filters/census/library.h
+++ b/test/cpp/ext/filters/census/library.h
@@ -23,10 +23,10 @@
#include <thread> // NOLINT
#include <vector>
+#include "absl/strings/str_cat.h"
#include "gtest/gtest.h"
#include "opencensus/stats/stats.h"
#include "opencensus/trace/exporter/span_exporter.h"
-#include "absl/strings/str_cat.h"
#include <grpc++/grpc++.h>
#include <grpcpp/opencensus.h>
diff --git a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
index cda3755..a75651f 100644
--- a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
+++ b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
@@ -20,14 +20,14 @@
#include <thread> // NOLINT
#include <vector>
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "opencensus/stats/stats.h"
#include "opencensus/stats/testing/test_utils.h"
#include "opencensus/tags/tag_map.h"
#include "opencensus/tags/with_tag_map.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
#include <grpc++/grpc++.h>
#include <grpcpp/opencensus.h>
diff --git a/test/cpp/ext/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h
index 5014741..dcfd7f5 100644
--- a/test/cpp/ext/filters/logging/library.h
+++ b/test/cpp/ext/filters/logging/library.h
@@ -22,12 +22,12 @@
#include <chrono>
#include <thread> // NOLINT
-#include "gmock/gmock.h"
-#include "google/protobuf/text_format.h"
-#include "gtest/gtest.h"
#include "absl/strings/escaping.h"
#include "absl/strings/str_cat.h"
#include "absl/time/time.h"
+#include "gmock/gmock.h"
+#include "google/protobuf/text_format.h"
+#include "gtest/gtest.h"
#include <grpc++/grpc++.h>
#include <grpcpp/opencensus.h>
diff --git a/test/cpp/ext/filters/logging/logging_census_integration_test.cc b/test/cpp/ext/filters/logging/logging_census_integration_test.cc
index 7e430c2..84bbbea 100644
--- a/test/cpp/ext/filters/logging/logging_census_integration_test.cc
+++ b/test/cpp/ext/filters/logging/logging_census_integration_test.cc
@@ -19,12 +19,12 @@
#include <chrono>
#include <thread> // NOLINT
+#include "absl/strings/escaping.h"
+#include "absl/strings/str_cat.h"
#include "gmock/gmock.h"
#include "google/protobuf/text_format.h"
#include "gtest/gtest.h"
#include "opencensus/stats/testing/test_utils.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_cat.h"
#include <grpc++/grpc++.h>
#include <grpcpp/opencensus.h>
diff --git a/test/cpp/ext/filters/logging/logging_test.cc b/test/cpp/ext/filters/logging/logging_test.cc
index d0272a2..fb4a8d0 100644
--- a/test/cpp/ext/filters/logging/logging_test.cc
+++ b/test/cpp/ext/filters/logging/logging_test.cc
@@ -19,11 +19,11 @@
#include <chrono>
#include <thread> // NOLINT
+#include "absl/strings/escaping.h"
+#include "absl/strings/str_cat.h"
#include "gmock/gmock.h"
#include "google/protobuf/text_format.h"
#include "gtest/gtest.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_cat.h"
#include <grpc++/grpc++.h>
#include <grpcpp/support/status.h>
diff --git a/test/cpp/ext/gcp/environment_autodetect_test.cc b/test/cpp/ext/gcp/environment_autodetect_test.cc
index 56cb97f..188b563 100644
--- a/test/cpp/ext/gcp/environment_autodetect_test.cc
+++ b/test/cpp/ext/gcp/environment_autodetect_test.cc
@@ -22,10 +22,10 @@
#include <thread> // NOLINT
#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
#include "absl/synchronization/notification.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
diff --git a/test/cpp/ext/gcp/observability_logging_sink_test.cc b/test/cpp/ext/gcp/observability_logging_sink_test.cc
index 13bfd8a..59a1b03 100644
--- a/test/cpp/ext/gcp/observability_logging_sink_test.cc
+++ b/test/cpp/ext/gcp/observability_logging_sink_test.cc
@@ -16,11 +16,11 @@
#include "src/cpp/ext/gcp/observability_logging_sink.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/str_format.h"
#include "gmock/gmock.h"
#include "google/protobuf/text_format.h"
#include "gtest/gtest.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_format.h"
#include "src/core/lib/json/json_reader.h"
#include "test/core/util/test_config.h"
diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc
index 42b66db..19654c2 100644
--- a/test/cpp/ext/otel/otel_plugin_test.cc
+++ b/test/cpp/ext/otel/otel_plugin_test.cc
@@ -18,12 +18,12 @@
#include "src/cpp/ext/otel/otel_plugin.h"
+#include "absl/functional/any_invocable.h"
#include "api/include/opentelemetry/metrics/provider.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "absl/functional/any_invocable.h"
#include <grpcpp/grpcpp.h>
diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc
index ed14e7d..88c7d4c 100644
--- a/test/cpp/ext/otel/otel_test_library.cc
+++ b/test/cpp/ext/otel/otel_test_library.cc
@@ -18,13 +18,13 @@
#include "test/cpp/ext/otel/otel_test_library.h"
+#include "absl/functional/any_invocable.h"
#include "api/include/opentelemetry/metrics/provider.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "opentelemetry/sdk/metrics/export/metric_producer.h"
#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "absl/functional/any_invocable.h"
#include <grpcpp/grpcpp.h>
diff --git a/test/cpp/ext/otel/otel_test_library.h b/test/cpp/ext/otel/otel_test_library.h
index 095145f..a485c1a 100644
--- a/test/cpp/ext/otel/otel_test_library.h
+++ b/test/cpp/ext/otel/otel_test_library.h
@@ -19,12 +19,12 @@
#ifndef GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H
#define GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H
+#include "absl/functional/any_invocable.h"
#include "api/include/opentelemetry/metrics/provider.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "absl/functional/any_invocable.h"
#include <grpcpp/generic/generic_stub.h>
#include <grpcpp/grpcpp.h>
diff --git a/test/cpp/interop/observability_client.cc b/test/cpp/interop/observability_client.cc
index e0e9b97..2139dbc 100644
--- a/test/cpp/interop/observability_client.cc
+++ b/test/cpp/interop/observability_client.cc
@@ -19,10 +19,10 @@
#include <memory>
#include <unordered_map>
+#include "absl/flags/flag.h"
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
#include "opentelemetry/exporters/prometheus/exporter_options.h"
#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "absl/flags/flag.h"
#include <grpc/grpc.h>
#include <grpc/support/alloc.h>
diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc
index 6467e76..8484e06 100644
--- a/test/cpp/interop/xds_interop_client.cc
+++ b/test/cpp/interop/xds_interop_client.cc
@@ -30,12 +30,12 @@
#include <utility>
#include <vector>
-#include "opentelemetry/exporters/prometheus/exporter_factory.h"
-#include "opentelemetry/exporters/prometheus/exporter_options.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
#include "absl/algorithm/container.h"
#include "absl/flags/flag.h"
#include "absl/strings/str_split.h"
+#include "opentelemetry/exporters/prometheus/exporter_factory.h"
+#include "opentelemetry/exporters/prometheus/exporter_options.h"
+#include "opentelemetry/sdk/metrics/meter_provider.h"
#include <grpcpp/ext/admin_services.h>
#include <grpcpp/ext/csm_observability.h>
diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc
index f46de60..a3b9548 100644
--- a/test/cpp/interop/xds_interop_server.cc
+++ b/test/cpp/interop/xds_interop_server.cc
@@ -18,10 +18,10 @@
#include <iostream>
+#include "absl/flags/flag.h"
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
#include "opentelemetry/exporters/prometheus/exporter_options.h"
#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "absl/flags/flag.h"
#include <grpc/grpc.h>
#include <grpcpp/ext/csm_observability.h>
diff --git a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
index 2bf1073..8e22228 100644
--- a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
+++ b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
@@ -21,9 +21,9 @@
#include <benchmark/benchmark.h>
-#include "opencensus/stats/stats.h"
#include "absl/base/call_once.h"
#include "absl/strings/str_cat.h"
+#include "opencensus/stats/stats.h"
#include <grpc/grpc.h>
#include <grpcpp/grpcpp.h>
diff --git a/test/cpp/server/authorization_policy_provider_test.cc b/test/cpp/server/authorization_policy_provider_test.cc
index f4b8ca9..cc08fdb 100644
--- a/test/cpp/server/authorization_policy_provider_test.cc
+++ b/test/cpp/server/authorization_policy_provider_test.cc
@@ -19,13 +19,13 @@
#include "test/core/util/test_config.h"
#include "test/core/util/tls_utils.h"
-#define VALID_POLICY_PATH_1 \
+#define VALID_POLICY_PATH_1 \
"test/core/security/authorization/test_policies/" \
"valid_policy_1.json"
-#define VALID_POLICY_PATH_2 \
+#define VALID_POLICY_PATH_2 \
"test/core/security/authorization/test_policies/" \
"valid_policy_2.json"
-#define INVALID_POLICY_PATH \
+#define INVALID_POLICY_PATH \
"test/core/security/authorization/test_policies/" \
"invalid_policy.json"
diff --git a/test/cpp/server/load_reporter/load_reporter_test.cc b/test/cpp/server/load_reporter/load_reporter_test.cc
index 504b2b3..a5acdda 100644
--- a/test/cpp/server/load_reporter/load_reporter_test.cc
+++ b/test/cpp/server/load_reporter/load_reporter_test.cc
@@ -26,8 +26,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "opencensus/stats/testing/test_utils.h"
#include "absl/memory/memory.h"
+#include "opencensus/stats/testing/test_utils.h"
#include <grpc/grpc.h>
diff --git a/test/cpp/util/channelz_sampler.cc b/test/cpp/util/channelz_sampler.cc
index 329aeea..60c0e12 100644
--- a/test/cpp/util/channelz_sampler.cc
+++ b/test/cpp/util/channelz_sampler.cc
@@ -27,10 +27,10 @@
#include <queue>
#include <string>
-#include "google/protobuf/text_format.h"
#include "absl/flags/flag.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_join.h"
+#include "google/protobuf/text_format.h"
#include <grpc/grpc.h>
#include <grpcpp/channel.h>
diff --git a/test/cpp/util/channelz_sampler_test.cc b/test/cpp/util/channelz_sampler_test.cc
index 2864d8a..209721f 100644
--- a/test/cpp/util/channelz_sampler_test.cc
+++ b/test/cpp/util/channelz_sampler_test.cc
@@ -26,8 +26,8 @@
#include <string>
#include <thread>
-#include "gtest/gtest.h"
#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
#include <grpc/grpc.h>
#include <grpc/support/alloc.h>
