[iwyu] Add more test directories (#30952)

* [iwyu] Add more test directories

* fix

* fix

* fix

* fix

* fix

* Automated change: Fix sanity tests

* fix

* iwyu

* Automated change: Fix sanity tests

* fix

* fix

* fix

* fix

* Automated change: Fix sanity tests

* fix

Co-authored-by: ctiller <ctiller@users.noreply.github.com>

BUILD

@@ -2917,17 +2917,22 @@ grpc_cc_library(
         "src/core/lib/event_engine/slice_buffer.cc",
     ],
     hdrs = [
+        "include/grpc/event_engine/slice.h",
+        "include/grpc/event_engine/slice_buffer.h",
         "src/core/lib/event_engine/handle_containers.h",
     ],
     external_deps = [
         "absl/container:flat_hash_set",
         "absl/hash",
+        "absl/strings",
+        "absl/utility",
     ],
     deps = [
         "event_engine_base_hdrs",
         "gpr",
         "gpr_platform",
         "slice",
+        "slice_buffer",
         "slice_refcount",
     ],
 )

CMakeLists.txt

@@ -9178,7 +9178,6 @@ target_link_libraries(endpoint_config_test
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   grpc
-  grpc_test_util_unsecure
 )
 
 
@@ -17931,6 +17930,14 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(test_core_event_engine_slice_buffer_test
+  src/core/lib/event_engine/resolved_address.cc
+  src/core/lib/event_engine/slice.cc
+  src/core/lib/event_engine/slice_buffer.cc
+  src/core/lib/gpr/murmur_hash.cc
+  src/core/lib/slice/slice.cc
+  src/core/lib/slice/slice_buffer.cc
+  src/core/lib/slice/slice_refcount.cc
+  src/core/lib/slice/slice_string_helpers.cc
   test/core/event_engine/slice_buffer_test.cc
   third_party/googletest/googletest/src/gtest-all.cc
   third_party/googletest/googlemock/src/gmock-all.cc
@@ -17958,8 +17965,12 @@ target_include_directories(test_core_event_engine_slice_buffer_test
 target_link_libraries(test_core_event_engine_slice_buffer_test
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
-  grpc
-  grpc_test_util_unsecure
+  absl::flat_hash_set
+  absl::any_invocable
+  absl::hash
+  absl::statusor
+  absl::utility
+  gpr
 )
 
 

build_autogenerated.yaml

@@ -5565,7 +5565,6 @@ targets:
   - test/core/event_engine/endpoint_config_test.cc
   deps:
   - grpc
-  - grpc_test_util_unsecure
   uses_polling: false
 - name: endpoint_pair_test
   gtest: true
@@ -9841,12 +9840,32 @@ targets:
   gtest: true
   build: test
   language: c++
-  headers: []
+  headers:
+  - src/core/lib/event_engine/handle_containers.h
+  - src/core/lib/gpr/murmur_hash.h
+  - src/core/lib/slice/slice.h
+  - src/core/lib/slice/slice_buffer.h
+  - src/core/lib/slice/slice_internal.h
+  - src/core/lib/slice/slice_refcount.h
+  - src/core/lib/slice/slice_refcount_base.h
+  - src/core/lib/slice/slice_string_helpers.h
   src:
+  - src/core/lib/event_engine/resolved_address.cc
+  - src/core/lib/event_engine/slice.cc
+  - src/core/lib/event_engine/slice_buffer.cc
+  - src/core/lib/gpr/murmur_hash.cc
+  - src/core/lib/slice/slice.cc
+  - src/core/lib/slice/slice_buffer.cc
+  - src/core/lib/slice/slice_refcount.cc
+  - src/core/lib/slice/slice_string_helpers.cc
   - test/core/event_engine/slice_buffer_test.cc
   deps:
-  - grpc
-  - grpc_test_util_unsecure
+  - absl/container:flat_hash_set
+  - absl/functional:any_invocable
+  - absl/hash:hash
+  - absl/status:statusor
+  - absl/utility:utility
+  - gpr
 - name: test_core_gpr_time_test
   gtest: true
   build: test

src/core/lib/gpr/murmur_hash.h

@@ -22,6 +22,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <stddef.h>
+#include <stdint.h>
 
 /* compute the hash of key (length len) */
 uint32_t gpr_murmur_hash3(const void* key, size_t len, uint32_t seed);

src/core/lib/gpr/string.h

@@ -21,8 +21,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <string>
 

src/core/lib/json/json_object_loader.h

@@ -21,6 +21,7 @@
 #include <cstring>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/meta/type_traits.h"

test/core/address_utils/parse_address_test.cc

@@ -17,21 +17,21 @@
  */
 
 #include "src/core/lib/address_utils/parse_address.h"
-
-#include <string.h>
 #ifdef GRPC_HAVE_UNIX_SOCKET
 #include <sys/un.h>
 #endif
 
-#include <gtest/gtest.h>
+#include <string>
 
+#include "absl/status/status.h"
 #include "absl/strings/match.h"
+#include "gtest/gtest.h"
 
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
 #include "test/core/util/test_config.h"

test/core/address_utils/parse_address_with_named_scope_id_test.cc

@@ -16,26 +16,33 @@
  *
  */
 
+#include <inttypes.h>
 #include <net/if.h>
+#include <netdb.h>
+#include <stdlib.h>
 #include <string.h>
+
+#include <grpc/support/alloc.h>
 #ifdef GRPC_HAVE_UNIX_SOCKET
 #include <sys/un.h>
 #endif
 
-#include <gtest/gtest.h>
+#include <string>
 
+#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>
 
 #include "src/core/lib/address_utils/parse_address.h"
-#include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/gprpp/host_port.h"
-#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
-#include "src/core/lib/iomgr/socket_utils.h"
+#include "src/core/lib/uri/uri_parser.h"
 #include "test/core/util/test_config.h"
 
 static void test_grpc_parse_ipv6_parity_with_getaddrinfo(

test/core/address_utils/sockaddr_utils_fuzzer_test.cc

@@ -14,14 +14,18 @@
 // limitations under the License.
 //
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
+#include <string>
+
+#include "absl/status/statusor.h"
+
+#include <grpc/support/log.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolve_address.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/uri/uri_parser.h"
 
 bool squelch = true;

test/core/address_utils/sockaddr_utils_test.cc

@@ -19,15 +19,24 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
 #include <errno.h>
+#include <stdint.h>
 #include <string.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"
 #ifdef GRPC_HAVE_UNIX_SOCKET
 #include <sys/un.h>
 #endif
 
+#include <string>
+
 #include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/address_utils/parse_address.h"

test/core/avl/avl_fuzzer.cc

@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdlib.h>
+
+#include <algorithm>
+#include <map>
+#include <utility>
+
 #include "src/core/lib/avl/avl.h"
 #include "src/libfuzzer/libfuzzer_macro.h"
 #include "test/core/avl/avl_fuzzer.pb.h"

test/core/avl/avl_test.cc

@@ -14,7 +14,7 @@
 
 #include "src/core/lib/avl/avl.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace grpc_core {
 

test/core/backoff/backoff_test.cc

@@ -20,7 +20,9 @@
 
 #include <algorithm>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
+
+#include <grpc/grpc.h>
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/exec_ctx.h"

test/core/bad_client/bad_client.cc

@@ -18,25 +18,31 @@
 
 #include "test/core/bad_client/bad_client.h"
 
+#include <inttypes.h>
 #include <limits.h>
-#include <stdio.h>
 
+#include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
+#include <grpc/support/log.h>
 #include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 
-#include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/gpr/murmur_hash.h"
+#include "src/core/lib/channel/channel_args_preconditioning.h"
+#include "src/core/lib/channel/channelz.h"
+#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/thd.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
-#include "src/core/lib/resource_quota/api.h"
-#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/lib/surface/server.h"
+#include "src/core/lib/transport/transport_fwd.h"
 #include "test/core/end2end/cq_verifier.h"
+#include "test/core/util/test_config.h"
 
 #define MIN_HTTP2_FRAME_SIZE 9
 

test/core/bad_client/bad_client.h

@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
 #define GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
 
-#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <grpc/grpc.h>
-
-#include "test/core/util/test_config.h"
+#include <grpc/slice.h>
 
 #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar"
 #define GRPC_BAD_CLIENT_REGISTERED_HOST "localhost"

test/core/bad_client/tests/bad_streaming_id.cc

@@ -16,14 +16,14 @@
  *
  */
 
-#include <string>
-
 #include <gtest/gtest.h>
 
-#include <grpc/support/string_util.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
+#include "test/core/util/test_config.h"
 
 #define HEADER_FRAME_ID_1                                                  \
   "\x00\x00\xc9\x01\x05\x00\x00\x00\x01" /* headers: generated from        \

test/core/bad_client/tests/badreq.cc

@@ -16,13 +16,12 @@
  *
  */
 
-#include <string.h>
-
 #include <grpc/grpc.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/end2end/cq_verifier.h"
+#include "test/core/util/test_config.h"
 
 #define PFX_STR                      \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \

test/core/bad_client/tests/connection_prefix.cc

@@ -16,8 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
+#include "test/core/util/test_config.h"
 
 static void verifier(grpc_server* server, grpc_completion_queue* cq,
                      void* /*registered_method*/) {

test/core/bad_client/tests/duplicate_header.cc

@@ -16,13 +16,17 @@
  *
  */
 
+#include <stdint.h>
 #include <string.h>
 
 #include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/log.h>
 
-#include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
+#include "test/core/util/test_config.h"
 
 #define PFX_STR                      \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \

test/core/bad_client/tests/head_of_line_blocking.cc

@@ -16,14 +16,19 @@
  *
  */
 
+#include <stdint.h>
 #include <string.h>
 
+#include <algorithm>
+
+#include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 
-#include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
+#include "test/core/util/test_config.h"
 
 static const char prefix[] =
     "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"

test/core/bad_client/tests/headers.cc

@@ -16,8 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
+#include "test/core/util/test_config.h"
 
 #define PFX_STR                      \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \

test/core/bad_client/tests/initial_settings_frame.cc

@@ -16,8 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
+#include "test/core/util/test_config.h"
 
 #define PFX_STR "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 #define ONE_SETTING_HDR "\x00\x00\x06\x04\x00\x00\x00\x00\x00"

test/core/bad_client/tests/large_metadata.cc

@@ -18,16 +18,19 @@
 
 #include <string.h>
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
 
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
-#include "test/core/end2end/cq_verifier.h"
+#include "test/core/util/test_config.h"
 
 // The large-metadata headers that we're adding for this test are not
 // actually appended to this in a single string, since the string would

test/core/bad_client/tests/out_of_bounds.cc

@@ -20,10 +20,12 @@
 
 #include <gtest/gtest.h>
 
-#include <grpc/support/string_util.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
+#include "test/core/util/test_config.h"
 
 #define APPEND_BUFFER(string, to_append) \
   ((string).append((to_append), sizeof(to_append) - 1))

test/core/bad_client/tests/server_registered_method.cc

@@ -16,11 +16,16 @@
  *
  */
 
-#include <string.h>
+#include <stdint.h>
+
+#include <grpc/byte_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
+#include "test/core/util/test_config.h"
 
 #define PFX_STR                                               \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"                          \

test/core/bad_client/tests/simple_request.cc

@@ -16,13 +16,16 @@
  *
  */
 
-#include <string.h>
+#include <stdint.h>
 
 #include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
+#include "test/core/util/test_config.h"
 
 #define PFX_STR                                                            \
   "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"                                       \

test/core/bad_client/tests/unknown_frame.cc

@@ -20,10 +20,12 @@
 
 #include <gtest/gtest.h>
 
-#include <grpc/support/string_util.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
+#include "test/core/util/test_config.h"
 
 static void verifier(grpc_server* server, grpc_completion_queue* cq,
                      void* /*registered_method*/) {

test/core/bad_client/tests/window_overflow.cc

@@ -16,13 +16,18 @@
  *
  */
 
+#include <stdint.h>
 #include <string.h>
 
+#include <algorithm>
+
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/surface/server.h"
 #include "test/core/bad_client/bad_client.h"
+#include "test/core/util/test_config.h"
 
 #define PFX_STR                                                            \
   "\x00\x00\x00\x04\x01\x00\x00\x00\x00"                                   \

test/core/bad_connection/close_fd_test.cc

@@ -21,22 +21,37 @@
  * an RPC call is in progress.
  *
  */
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "absl/status/statusor.h"
+
+#include <grpc/impl/codegen/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+
 #include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/channelz.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/endpoint.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
+#include "src/core/lib/surface/channel_stack_type.h"
+#include "src/core/lib/transport/transport_fwd.h"
+
+struct test_ctx;
 
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_TCP
 
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/time.h>
 
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"

test/core/bad_ssl/bad_ssl_test.cc

@@ -16,18 +16,23 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <string>
+
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <grpc/impl/codegen/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/global_config_generic.h"
 #include "src/core/lib/gprpp/host_port.h"
-#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/security/security_connector/ssl_utils_config.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/util/port.h"

test/core/bad_ssl/server_common.cc

@@ -21,6 +21,7 @@
 #include <signal.h>
 
 #include <grpc/support/log.h>
+#include <grpc/support/time.h>
 
 #include "test/core/util/cmdline.h"
 #include "test/core/util/test_config.h"

test/core/bad_ssl/servers/alpn.cc

@@ -22,9 +22,11 @@
 
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <grpc/slice.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/load_file.h"
 #include "test/core/bad_ssl/server_common.h"
 

test/core/bad_ssl/servers/cert.cc

@@ -16,12 +16,12 @@
  *
  */
 
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <grpc/slice.h>
 #include <grpc/support/log.h>
 
+#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/load_file.h"
 #include "test/core/bad_ssl/server_common.h"
 

test/core/channel/call_finalization_test.cc

@@ -14,8 +14,16 @@
 
 #include "src/core/lib/channel/call_finalization.h"
 
-#include <gtest/gtest.h>
+#include <memory>
+#include <string>
 
+#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/memory_allocator.h>
+
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "test/core/promise/test_context.h"
 

test/core/channel/channel_args_test.cc

@@ -20,20 +20,17 @@
 
 #include <string.h>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
+#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
-#include <grpc/impl/codegen/log.h>
+#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/surface/channel.h"
 #include "test/core/util/test_config.h"
 
 namespace grpc_core {

test/core/channel/channel_stack_builder_test.cc

@@ -21,17 +21,20 @@
 #include <limits.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
+#include <algorithm>
 
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
+
+#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/surface/channel_init.h"
 #include "test/core/util/test_config.h"
 

test/core/channel/channel_stack_test.cc

@@ -18,16 +18,15 @@
 
 #include "src/core/lib/channel/channel_stack.h"
 
-#include <string.h>
+#include <string>
 
-#include <gtest/gtest.h>
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
-#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/util/test_config.h"
 
 static grpc_error_handle channel_init_func(grpc_channel_element* elem,

test/core/channel/channel_trace_test.cc

@@ -19,21 +19,18 @@
 #include "src/core/lib/channel/channel_trace.h"
 
 #include <stdlib.h>
-#include <string.h>
 
-#include <gtest/gtest.h>
+#include <string>
 
+#include "gtest/gtest.h"
+
+#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channelz.h"
-#include "src/core/lib/channel/channelz_registry.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/json/json.h"
-#include "src/core/lib/surface/channel.h"
 #include "test/core/util/test_config.h"
 #include "test/cpp/util/channel_trace_proto_helper.h"
 

test/core/channel/channelz_registry_test.cc

@@ -19,22 +19,13 @@
 #include "src/core/lib/channel/channelz_registry.h"
 
 #include <stdlib.h>
-#include <string.h>
 
-#include <gtest/gtest.h>
+#include <algorithm>
+#include <vector>
 
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
+#include "gtest/gtest.h"
 
-#include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/channel/channelz.h"
-#include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/gprpp/memory.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/surface/channel.h"
 #include "test/core/util/test_config.h"
 
 namespace grpc_core {

test/core/channel/channelz_test.cc

@@ -19,16 +19,21 @@
 #include "src/core/lib/channel/channelz.h"
 
 #include <stdlib.h>
-#include <string.h>
 
-#include <gtest/gtest.h>
+#include <algorithm>
+#include <memory>
 
+#include "absl/memory/memory.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
+
+#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 
-#include "src/core/lib/channel/channel_trace.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channelz_registry.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"

test/core/channel/minimal_stack_is_minimal_test.cc

@@ -29,22 +29,27 @@
  * configurations and assess whether such a change is correct and desirable.
  */
 
+#include <stdarg.h>
 #include <string.h>
 
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
+#include <algorithm>
+#include <string>
+#include <vector>
+
 #include "absl/strings/str_join.h"
 
 #include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
+#include <grpc/support/log.h>
 
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/gpr/string.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
+#include "src/core/lib/transport/transport_fwd.h"
 #include "src/core/lib/transport/transport_impl.h"
 #include "test/core/util/test_config.h"
 

test/core/channel/status_util_test.cc

@@ -18,7 +18,7 @@
 
 #include "src/core/lib/channel/status_util.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace grpc_core {
 namespace internal {

test/core/client_channel/client_channel_test.cc

@@ -18,9 +18,11 @@
 
 #include "src/core/ext/filters/client_channel/client_channel.h"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
+#include <grpc/grpc.h>
+
+#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/util/test_config.h"
 

test/core/client_channel/http_proxy_mapper_test.cc

@@ -16,7 +16,12 @@
 //
 //
 
-#include <gmock/gmock.h>
+#include <string>
+
+#include "absl/types/optional.h"
+#include "gtest/gtest.h"
+
+#include <grpc/grpc.h>
 
 #include "src/core/ext/filters/client_channel/http_proxy.h"
 #include "src/core/lib/channel/channel_args.h"

test/core/client_channel/resolvers/binder_resolver_test.cc

@@ -12,24 +12,35 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/memory/memory.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
 
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/port.h"
+#include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/lib/resolver/resolver.h"
+#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/lib/resolver/server_address.h"
+#include "src/core/lib/uri/uri_parser.h"
 #include "test/core/util/test_config.h"
 
 #ifdef GRPC_HAVE_UNIX_SOCKET
 
+#include <sys/socket.h>
 #include <sys/un.h>
 
-#include <cstring>
-
 #include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
-#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resolver/resolver_registry.h"
 

test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc

@@ -16,28 +16,49 @@
  *
  */
 
-#include <cstring>
+#include <inttypes.h>
+
 #include <functional>
 #include <memory>
+#include <string>
+#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/string_view.h"
+#include "gtest/gtest.h"
 
+#include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 
 #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
-#include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
-#include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/work_serializer.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/pollset.h"
+#include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolve_address.h"
+#include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/lib/resolver/resolver.h"
+#include "src/core/lib/resolver/resolver_factory.h"
 #include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
+#include "src/core/lib/uri/uri_parser.h"
 #include "test/core/util/test_config.h"
 
 constexpr int kMinResolutionPeriodMs = 1000;

test/core/client_channel/resolvers/dns_resolver_test.cc

@@ -16,21 +16,30 @@
  *
  */
 
-#include <string.h>
+#include <memory>
+#include <string>
+#include <utility>
 
-#include <gtest/gtest.h>
+#include "absl/memory/memory.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/support/log.h>
 
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
 #include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/global_config_generic.h"
 #include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/resolver/resolver.h"
+#include "src/core/lib/resolver/resolver_factory.h"
 #include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/lib/uri/uri_parser.h"
 #include "test/core/util/test_config.h"
 
 static std::shared_ptr<grpc_core::WorkSerializer>* g_work_serializer;

test/core/client_channel/resolvers/fake_resolver_test.cc

@@ -18,25 +18,36 @@
 
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
 
+#include <inttypes.h>
 #include <string.h>
 
+#include <algorithm>
+#include <memory>
 #include <string>
+#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 "gtest/gtest.h"
 
-#include <grpc/support/alloc.h>
+#include <grpc/grpc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/sync.h>
 
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/work_serializer.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/lib/resolver/resolver_factory.h"
 #include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
-#include "src/core/lib/security/credentials/fake/fake_credentials.h"
+#include "src/core/lib/uri/uri_parser.h"
 #include "test/core/util/test_config.h"
 
 class ResultHandler : public grpc_core::Resolver::ResultHandler {

test/core/client_channel/resolvers/google_c2p_resolver_test.cc

@@ -14,31 +14,24 @@
 // limitations under the License.
 //
 
-#include <atomic>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <sstream>
-#include <thread>
+#include <stddef.h>
 
-#include <gmock/gmock.h>
+#include <functional>
+#include <memory>
+#include <string>
+#include <thread>
+#include <vector>
 
 #include "absl/strings/str_format.h"
+#include "gtest/gtest.h"
 
 #include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
 #include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
-#include <grpcpp/impl/codegen/sync.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
 
 #include "src/core/lib/gprpp/env.h"
-#include "src/core/lib/gprpp/thd.h"
 #include "test/core/util/fake_udp_and_tcp_server.h"
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"

test/core/client_channel/resolvers/sockaddr_resolver_test.cc

@@ -16,20 +16,27 @@
  *
  */
 
-#include <string.h>
+#include <memory>
+#include <string>
+#include <utility>
 
-#include <gtest/gtest.h>
+#include "absl/memory/memory.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/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
-#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/port.h"
+#include "src/core/lib/resolver/resolver.h"
+#include "src/core/lib/resolver/resolver_factory.h"
 #include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/lib/uri/uri_parser.h"
 #include "test/core/util/test_config.h"
 
 static std::shared_ptr<grpc_core::WorkSerializer>* g_work_serializer;

test/core/client_channel/retry_throttle_test.cc

@@ -18,7 +18,7 @@
 
 #include "src/core/ext/filters/client_channel/retry_throttle.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 #include "test/core/util/test_config.h"
 

test/core/client_channel/rls_lb_config_parser_test.cc

@@ -14,12 +14,17 @@
 // limitations under the License.
 //
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <string>
+
+#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 "src/core/lib/gprpp/env.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/service_config/service_config_impl.h"
 #include "test/core/util/test_config.h"
 

test/core/client_channel/service_config_test.cc

@@ -18,22 +18,36 @@
 
 #include "src/core/lib/service_config/service_config.h"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
+#include "absl/memory/memory.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>
+#include <grpc/status.h>
 
 #include "src/core/ext/filters/client_channel/resolver_result_parsing.h"
 #include "src/core/ext/filters/client_channel/retry_service_config.h"
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/status_util.h"
+#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
+#include "src/core/lib/json/json.h"
+#include "src/core/lib/load_balancing/lb_policy.h"
 #include "src/core/lib/service_config/service_config_impl.h"
 #include "src/core/lib/service_config/service_config_parser.h"
-#include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
 namespace grpc_core {

test/core/client_idle/idle_filter_state_test.cc

@@ -14,13 +14,13 @@
 
 #include "src/core/ext/filters/channel_idle/idle_filter_state.h"
 
-#include <stdio.h>
-
 #include <chrono>
 #include <random>
 #include <thread>
+#include <utility>
+#include <vector>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 namespace grpc_core {
 namespace testing {

test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc

@@ -14,7 +14,7 @@
 
 #include <grpc/impl/codegen/port_platform.h>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 // Make a template argument to test which bit pattern remains in A's destructor
 // to try and detect similar bugs in non-MSAN builds (none have been detected

test/core/compression/args_utils.cc

@@ -16,9 +16,12 @@
 
 #include <string.h>
 
+#include "absl/types/optional.h"
+
 #include <grpc/compression.h>
 #include <grpc/support/log.h>
 
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/gpr/useful.h"
 

test/core/compression/args_utils.h

@@ -15,7 +15,8 @@
 #ifndef GRPC_TEST_CORE_COMPRESSION_ARGS_UTILS_H_H
 #define GRPC_TEST_CORE_COMPRESSION_ARGS_UTILS_H_H
 
-#include "src/core/lib/channel/channel_args.h"
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
 
 // TODO(ctiller): when we do the channel args migration, just delete this.
 const grpc_channel_args*

test/core/compression/compression_test.cc

@@ -16,13 +16,14 @@
  *
  */
 
+#include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
+#include <grpc/slice.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/channel/channel_args.h"

test/core/compression/message_compress_fuzzer.cc

@@ -16,14 +16,15 @@
  *
  */
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <grpc/compression.h>
 #include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
 
 #include "src/core/lib/compression/message_compress.h"
-#include "src/core/lib/security/credentials/credentials.h"
 
 bool squelch = true;
 

test/core/compression/message_compress_test.cc

@@ -18,13 +18,14 @@
 
 #include "src/core/lib/compression/message_compress.h"
 
+#include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 #include <grpc/compression.h>
-#include <grpc/grpc.h>
+#include <grpc/slice_buffer.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gpr/murmur_hash.h"

test/core/compression/message_decompress_fuzzer.cc

@@ -16,14 +16,15 @@
  *
  */
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <grpc/compression.h>
 #include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
 
 #include "src/core/lib/compression/message_compress.h"
-#include "src/core/lib/security/credentials/credentials.h"
 
 bool squelch = true;
 

test/core/config/core_configuration_test.cc

@@ -14,8 +14,10 @@
 
 #include "src/core/lib/config/core_configuration.h"
 
+#include <algorithm>
 #include <chrono>
 #include <thread>
+#include <vector>
 
 #include <gtest/gtest.h>
 

test/core/debug/stats_test.cc

@@ -18,16 +18,18 @@
 
 #include "src/core/lib/debug/stats.h"
 
-#include <mutex>
+#include <algorithm>
+#include <map>
+#include <memory>
 #include <queue>
 #include <random>
 #include <thread>
+#include <utility>
+#include <vector>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 #include <grpc/grpc.h>
-#include <grpc/support/cpu.h>
-#include <grpc/support/log.h>
 
 #include "test/core/util/test_config.h"
 

test/core/event_engine/BUILD

@@ -24,9 +24,13 @@ grpc_package(
 grpc_cc_test(
     name = "common_closures_test",
     srcs = ["common_closures_test.cc"],
-    external_deps = ["gtest"],
+    external_deps = [
+        "absl/functional:any_invocable",
+        "gtest",
+    ],
     deps = [
         "//:common_event_engine_closures",
+        "//:event_engine_base_hdrs",
         "//:gpr_platform",
         "//:notification",
     ],
@@ -50,10 +54,7 @@ grpc_cc_test(
 grpc_cc_test(
     name = "thread_pool_test",
     srcs = ["thread_pool_test.cc"],
-    external_deps = [
-        "absl/synchronization",
-        "gtest",
-    ],
+    external_deps = ["gtest"],
     deps = [
         "//:event_engine_thread_pool",
         "//:gpr",
@@ -64,20 +65,29 @@ grpc_cc_test(
 grpc_cc_test(
     name = "endpoint_config_test",
     srcs = ["endpoint_config_test.cc"],
-    external_deps = ["gtest"],
+    external_deps = [
+        "absl/types:optional",
+        "gtest",
+    ],
     language = "C++",
     uses_polling = False,
     deps = [
         "//:gpr_platform",
         "//:grpc",
-        "//test/core/util:grpc_test_util_unsecure",
     ],
 )
 
 grpc_cc_test(
     name = "default_engine_methods_test",
     srcs = ["default_engine_methods_test.cc"],
-    external_deps = ["gtest"],
+    external_deps = [
+        "absl/functional:any_invocable",
+        "absl/memory",
+        "absl/status",
+        "absl/status:statusor",
+        "absl/time",
+        "gtest",
+    ],
     deps = [
         "//:default_event_engine",
         "//:event_engine_base_hdrs",
@@ -104,11 +114,10 @@ grpc_cc_test(
     srcs = ["slice_buffer_test.cc"],
     external_deps = ["gtest"],
     deps = [
-        "//:event_engine_base_hdrs",
+        "//:event_engine_common",
+        "//:gpr",
         "//:gpr_platform",
-        "//:grpc",
         "//:slice",
-        "//test/core/util:grpc_test_util_unsecure",
     ],
 )
 
@@ -116,9 +125,9 @@ grpc_cc_library(
     name = "test_init",
     srcs = ["test_init.cc"],
     hdrs = ["test_init.h"],
-    external_deps = ["absl/strings"],
-    deps = [
-        "//:event_engine_base_hdrs",
-        "//:gpr",
+    external_deps = [
+        "absl/status",
+        "absl/strings",
     ],
+    deps = ["//:gpr"],
 )

test/core/event_engine/common_closures_test.cc

@@ -16,7 +16,10 @@
 
 #include "src/core/lib/event_engine/common_closures.h"
 
-#include <gtest/gtest.h>
+#include "absl/functional/any_invocable.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/event_engine.h>
 
 #include "src/core/lib/gprpp/notification.h"
 

test/core/event_engine/default_engine_methods_test.cc

@@ -13,16 +13,25 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>
 
+#include <algorithm>
+#include <memory>
 #include <thread>
+#include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "absl/functional/any_invocable.h"
+#include "absl/memory/memory.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>
+#include <grpc/event_engine/memory_allocator.h>
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "test/core/util/test_config.h"
 
 namespace {

test/core/event_engine/endpoint_config_test.cc

@@ -13,15 +13,11 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/grpc.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"
-#include "test/core/util/test_config.h"
 
 using ::grpc_event_engine::experimental::ChannelArgsEndpointConfig;
 

test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc

@@ -14,11 +14,16 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
-#include <inttypes.h>
+#include <stdlib.h>
 
+#include <algorithm>
 #include <chrono>
+#include <ratio>
+#include <vector>
 
 #include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 
 #include "src/core/lib/gprpp/time.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"

test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h

@@ -18,10 +18,17 @@
 #include <chrono>
 #include <cstdint>
 #include <map>
+#include <memory>
+#include <utility>
 
+#include "absl/base/thread_annotations.h"
 #include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 
+#include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
 #include <grpc/grpc.h>
 
 #include "src/core/lib/gprpp/sync.h"

test/core/event_engine/posix/event_poller_posix_test.cc

@@ -12,41 +12,52 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdint.h>
+#include <sys/select.h>
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
 #include <cstring>
-#include <ostream>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/functional/any_invocable.h"
+#include "absl/memory/memory.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/event_engine.h>
 
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
+#include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/port.h"
 
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_EV
 
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <poll.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <unistd.h>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "absl/status/status.h"
 
-#include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
-#include <grpc/support/time.h>
 
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"

test/core/event_engine/posix/lock_free_event_test.cc

@@ -12,13 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <stdlib.h>
-#include <string.h>
-
+#include <algorithm>
+#include <memory>
 #include <thread>
+#include <utility>
+#include <vector>
 
-#include <gmock/gmock.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 "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"

test/core/event_engine/posix/tcp_posix_socket_utils_test.cc

@@ -12,9 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdint.h>
 #include <sys/socket.h>
+#include <unistd.h>
+
+#include <string>
 
 #include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
 
 #include "src/core/lib/iomgr/port.h"
 
@@ -29,12 +40,10 @@
 #include <sys/un.h>
 #endif
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/sync.h>
 
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/gpr/useful.h"

test/core/event_engine/posix/timer_heap_test.cc

@@ -18,14 +18,19 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 
+#include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <algorithm>
+#include <memory>
+#include <utility>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include <grpc/support/log.h>
 
 #include "src/core/lib/event_engine/posix_engine/timer.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/bitset.h"
 
 using testing::Contains;

test/core/event_engine/posix/timer_list_test.cc

@@ -16,14 +16,15 @@
  *
  */
 
-#include <string.h>
-
 #include <cstdint>
 #include <limits>
+#include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
+#include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/posix_engine/timer.h"

test/core/event_engine/posix/timer_manager_test.cc

@@ -14,16 +14,17 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 
-#include <string.h>
-
+#include <algorithm>
 #include <atomic>
-#include <cstdint>
-#include <limits>
 #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>
 
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"

test/core/event_engine/posix/traced_buffer_list_test.cc

@@ -14,9 +14,9 @@
 
 #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h"
 
-#include <atomic>
+#include <time.h>
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 #include <grpc/grpc.h>
 
@@ -25,6 +25,8 @@
 
 #ifdef GRPC_LINUX_ERRQUEUE
 
+#include <linux/errqueue.h>
+
 #define NUM_ELEM 5
 
 namespace grpc_event_engine {

test/core/event_engine/posix/wakeup_fd_posix_test.cc

@@ -14,13 +14,10 @@
 
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <memory>
 
-#include <thread>
-
-#include <gmock/gmock.h>
-#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"

test/core/event_engine/slice_buffer_test.cc

@@ -14,14 +14,17 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <string.h>
 
+#include <utility>
+
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/slice.h>
 #include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-
-#include "src/core/lib/slice/slice.h"
-#include "test/core/util/test_config.h"
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 
 using ::grpc_event_engine::experimental::Slice;
 using ::grpc_event_engine::experimental::SliceBuffer;

test/core/event_engine/smoke_test.cc

@@ -13,8 +13,10 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <memory>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>

test/core/event_engine/test_init.cc

@@ -17,8 +17,6 @@
 
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/log.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 

test/core/event_engine/test_init.h

@@ -13,11 +13,12 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H
 
-#include <grpc/event_engine/event_engine.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 

test/core/event_engine/test_suite/client_test.cc

@@ -12,14 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdlib.h>
+
 #include <chrono>
+#include <memory>
 #include <random>
 #include <string>
 #include <thread>
+#include <tuple>
+#include <utility>
 #include <vector>
 
+#include "absl/memory/memory.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>
@@ -30,6 +39,7 @@
 #include "src/core/lib/gprpp/notification.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
 #include "test/core/event_engine/test_suite/event_engine_test.h"
 #include "test/core/event_engine/test_suite/event_engine_test_utils.h"
 #include "test/core/util/port.h"

test/core/event_engine/test_suite/dns_test.cc

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gtest/gtest.h>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/event_engine/test_suite/event_engine_test.h"
 

test/core/event_engine/test_suite/event_engine_test.h

@@ -14,11 +14,13 @@
 
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_H
+#include <functional>
+#include <memory>
+
 #include <gtest/gtest.h>
 
 #include <grpc/event_engine/event_engine.h>
-
-#include "src/core/lib/gprpp/sync.h"
+#include <grpc/support/log.h>
 
 extern std::function<
     std::unique_ptr<grpc_event_engine::experimental::EventEngine>()>*

test/core/event_engine/test_suite/event_engine_test_utils.cc

@@ -14,30 +14,31 @@
 
 #include "test/core/event_engine/test_suite/event_engine_test_utils.h"
 
-#include <cstring>
 #include <memory>
 #include <string>
 #include <utility>
 
+#include "absl/memory/memory.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-#include "absl/synchronization/mutex.h"
 
-#include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/gprpp/notification.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/uri/uri_parser.h"
 
+// IWYU pragma: no_include <sys/socket.h>
+
 using Endpoint = ::grpc_event_engine::experimental::EventEngine::Endpoint;
 using Listener = ::grpc_event_engine::experimental::EventEngine::Listener;
 

test/core/event_engine/test_suite/event_engine_test_utils.h

@@ -19,15 +19,18 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <tuple>
 #include <utility>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
 #include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
 
 #include "src/core/lib/gprpp/notification.h"
+#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 
 using EventEngineFactory = std::function<

test/core/event_engine/test_suite/fuzzing_event_engine_test.cc

@@ -14,12 +14,15 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
+#include <atomic>
 #include <chrono>
 #include <thread>
 
-#include "absl/time/clock.h"
+#include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
+#include "absl/memory/memory.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
 #include "test/core/event_engine/test_suite/event_engine_test.h"

test/core/event_engine/test_suite/oracle_event_engine_posix.cc

@@ -15,17 +15,18 @@
 #include "test/core/event_engine/test_suite/oracle_event_engine_posix.h"
 
 #include <poll.h>
-#include <sys/poll.h>
+#include <stdlib.h>
 #include <sys/socket.h>
+#include <unistd.h>
 
 #include <algorithm>
 #include <cerrno>
 #include <cstring>
 #include <memory>
 
+#include "absl/memory/memory.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-#include "absl/synchronization/mutex.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 

test/core/event_engine/test_suite/oracle_event_engine_posix.h

@@ -15,19 +15,24 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_ORACLE_EVENT_ENGINE_POSIX_H_
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_ORACLE_EVENT_ENGINE_POSIX_H_
 
-#include <functional>
 #include <memory>
 #include <string>
-#include <unordered_map>
 #include <utility>
+#include <vector>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
+#include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/support/log.h>
 
+#include "src/core/lib/gprpp/notification.h"
+#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "test/core/event_engine/test_suite/event_engine_test_utils.h"
 

test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc

@@ -13,6 +13,10 @@
 // limitations under the License.
 #include "test/core/event_engine/test_suite/oracle_event_engine_posix.h"
 
+#include <gtest/gtest.h>
+
+#include "absl/memory/memory.h"
+
 #include "test/core/event_engine/test_suite/event_engine_test.h"
 #include "test/core/util/test_config.h"
 

test/core/event_engine/test_suite/posix_event_engine_test.cc

@@ -11,7 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <grpc/grpc.h>
+#include <memory>
+
+#include <gtest/gtest.h>
+
+#include "absl/memory/memory.h"
+
+#include <grpc/event_engine/event_engine.h>
 
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 #include "test/core/event_engine/test_suite/event_engine_test.h"

test/core/event_engine/test_suite/server_test.cc

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gtest/gtest.h>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/event_engine/test_suite/event_engine_test.h"
 

test/core/event_engine/test_suite/timer_test.cc

@@ -12,15 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <atomic>
 #include <chrono>
+#include <cstdint>
+#include <memory>
 #include <random>
 #include <thread>
+#include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
+#include "absl/base/thread_annotations.h"
 #include "absl/functional/bind_front.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>

test/core/event_engine/test_suite/windows_event_engine_test.cc

@@ -11,11 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <grpc/grpc.h>
-
-#include "src/core/lib/event_engine/windows/windows_engine.h"
-#include "test/core/event_engine/test_suite/event_engine_test.h"
-#include "test/core/util/test_config.h"
 
 #ifdef GPR_WINDOWS
 

test/core/event_engine/thread_pool_test.cc

@@ -14,13 +14,11 @@
 
 #include "src/core/lib/event_engine/thread_pool.h"
 
-#include <atomic>
+#include <stdlib.h>
+
 #include <chrono>
 #include <thread>
 
-#include <gtest/gtest.h>
-
-#include "absl/synchronization/notification.h"
 #include "gtest/gtest.h"
 
 #include <grpc/support/log.h>

test/core/event_engine/work_queue/work_queue_fuzzer.cc

@@ -13,9 +13,15 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>
 
-#include <deque>
+#include <stdlib.h>
 
-#include "absl/container/flat_hash_map.h"
+#include <deque>
+#include <utility>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/types/optional.h"
+
+#include <grpc/event_engine/event_engine.h>
 
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/work_queue.h"

test/core/event_engine/work_queue/work_queue_test.cc

@@ -16,10 +16,17 @@
 #include "src/core/lib/event_engine/work_queue.h"
 
 #include <thread>
+#include <vector>
 
-#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/event_engine/event_engine.h>
 
 #include "src/core/lib/event_engine/common_closures.h"
+#include "src/core/lib/gprpp/time.h"
 #include "test/core/util/test_config.h"
 
 namespace {

test/core/ext/filters/rbac/rbac_service_config_parser_test.cc

@@ -14,10 +14,17 @@
 
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 
-#include <gmock/gmock-matchers.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <string>
 
+#include "absl/status/status.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/service_config/service_config.h"
 #include "src/core/lib/service_config/service_config_impl.h"
 #include "test/core/util/test_config.h"
 

test/core/filters/client_auth_filter_test.cc

@@ -12,15 +12,45 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <stddef.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "absl/types/variant.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/status.h>
+
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/context.h"
+#include "src/core/lib/channel/promise_based_filter.h"
+#include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/unique_type_name.h"
+#include "src/core/lib/promise/arena_promise.h"
+#include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/promise.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/security/context/security_context.h"
+#include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
-#include "src/core/lib/security/security_connector/fake/fake_security_connector.h"
+#include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/security/transport/auth_filters.h"
+#include "src/core/lib/slice/slice.h"
+#include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/lib/transport/transport.h"
 #include "test/core/promise/test_context.h"
 
 // TODO(roth): Need to add a lot more tests here.  I created this file

test/core/filters/client_authority_filter_test.cc

@@ -14,9 +14,22 @@
 
 #include "src/core/ext/filters/http/client_authority_filter.h"
 
-#include <gtest/gtest.h>
+#include <memory>
 
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/variant.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/promise/poll.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
+#include "src/core/lib/transport/metadata_batch.h"
 #include "test/core/promise/test_context.h"
 
 namespace grpc_core {