Clean up the TODO item in build target `grpc_base` part `channel_args` (#31642 An error occurred )

* Clean up the TODO item in build target `grpc_base` part `channel_args`

* Update

* Update

* Update

* Automated change: Fix sanity tests

* update

* Automated change: Fix sanity tests

BUILD

@@ -504,6 +504,7 @@ grpc_cc_library(
         "grpc_trace",
         "http_connect_handshaker",
         "iomgr_timer",
+        "//src/core:channel_args",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",
         "//src/core:default_event_engine",
@@ -582,6 +583,7 @@ grpc_cc_library(
         "sockaddr_utils",
         "tsi_base",
         "uri_parser",
+        "//src/core:channel_args",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",
         "//src/core:default_event_engine",
@@ -994,6 +996,7 @@ grpc_cc_library(
         "orphanable",
         "ref_counted_ptr",
         "//src/core:arena",
+        "//src/core:channel_args",
         "//src/core:channel_args_preconditioning",
         "//src/core:channel_stack_type",
         "//src/core:default_event_engine",
@@ -1260,21 +1263,19 @@ grpc_cc_library(
         "//src/core:lib/transport/transport_op_string.cc",
     ],
     hdrs = [
-        "//src/core:lib/transport/error_utils.h",
         "//src/core:lib/address_utils/parse_address.h",
         "//src/core:lib/channel/call_finalization.h",
         "//src/core:lib/channel/call_tracer.h",
         "//src/core:lib/channel/channel_stack.h",
-        "//src/core:lib/channel/promise_based_filter.h",
         "//src/core:lib/channel/channel_stack_builder_impl.h",
         "//src/core:lib/channel/channel_trace.h",
         "//src/core:lib/channel/channelz.h",
         "//src/core:lib/channel/channelz_registry.h",
         "//src/core:lib/channel/connected_channel.h",
         "//src/core:lib/channel/context.h",
+        "//src/core:lib/channel/promise_based_filter.h",
         "//src/core:lib/channel/status_util.h",
         "//src/core:lib/compression/compression_internal.h",
-        "//src/core:lib/resource_quota/api.h",
         "//src/core:lib/compression/message_compress.h",
         "//src/core:lib/event_engine/channel_args_endpoint_config.h",
         "//src/core:lib/iomgr/block_annotate.h",
@@ -1322,6 +1323,7 @@ grpc_cc_library(
         "//src/core:lib/iomgr/unix_sockets_posix.h",
         "//src/core:lib/iomgr/wakeup_fd_pipe.h",
         "//src/core:lib/iomgr/wakeup_fd_posix.h",
+        "//src/core:lib/resource_quota/api.h",
         "//src/core:lib/slice/b64.h",
         "//src/core:lib/surface/api_trace.h",
         "//src/core:lib/surface/builtins.h",
@@ -1337,20 +1339,13 @@ grpc_cc_library(
         "//src/core:lib/surface/server.h",
         "//src/core:lib/surface/validate_metadata.h",
         "//src/core:lib/transport/connectivity_state.h",
+        "//src/core:lib/transport/error_utils.h",
         "//src/core:lib/transport/metadata_batch.h",
         "//src/core:lib/transport/parsed_metadata.h",
         "//src/core:lib/transport/status_conversion.h",
         "//src/core:lib/transport/timeout_encoding.h",
         "//src/core:lib/transport/transport.h",
         "//src/core:lib/transport/transport_impl.h",
-    ] +
-    # TODO(ctiller): remove these
-    # These headers used to be vended by this target, but they have been split
-    # out into separate targets now. In order to transition downstream code, we
-    # re-export these headers from here for now, and when LSC's have completed
-    # to clean this up, we'll remove these.
-    [
-        "//src/core:lib/channel/channel_args.h",
     ],
     external_deps = [
         "absl/base:core_headers",
@@ -1394,7 +1389,6 @@ grpc_cc_library(
         "//src/core:arena",
         "//src/core:arena_promise",
         "//src/core:atomic_utils",
-        "//src/core:avl",
         "//src/core:bitset",
         "//src/core:channel_args",
         "//src/core:channel_args_preconditioning",
@@ -1770,6 +1764,7 @@ grpc_cc_library(
         "iomgr_timer",
         "ref_counted_ptr",
         "//src/core:arena",
+        "//src/core:channel_args",
         "//src/core:channel_fwd",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",
@@ -1834,6 +1829,7 @@ grpc_cc_library(
         "iomgr_timer",
         "ref_counted_ptr",
         "//src/core:arena",
+        "//src/core:channel_args",
         "//src/core:channel_init",
         "//src/core:closure",
         "//src/core:error",
@@ -2143,6 +2139,7 @@ grpc_cc_library(
         "grpc++_base",
         "grpc_base",
         "//src/core:arena",
+        "//src/core:channel_args",
         "//src/core:channel_stack_type",
         "//src/core:closure",
         "//src/core:slice",
@@ -2699,6 +2696,7 @@ grpc_cc_library(
         "xds_orca_service_upb",
         "xds_orca_upb",
         "//src/core:arena",
+        "//src/core:channel_args",
         "//src/core:channel_fwd",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",
@@ -2784,6 +2782,7 @@ grpc_cc_library(
         "server_address",
         "sockaddr_utils",
         "uri_parser",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//src/core:error",
         "//src/core:event_engine_common",
@@ -2839,6 +2838,7 @@ grpc_cc_library(
         "ref_counted_ptr",
         "sockaddr_utils",
         "uri_parser",
+        "//src/core:channel_args",
         "//src/core:channel_args_preconditioning",
         "//src/core:closure",
         "//src/core:error",
@@ -2886,6 +2886,7 @@ grpc_cc_library(
         "tsi_alts_credentials",
         "tsi_base",
         "//src/core:arena_promise",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//src/core:error",
         "//src/core:iomgr_fwd",
@@ -3053,6 +3054,7 @@ grpc_cc_library(
         "grpc_base",
         "tsi_base",
         "//src/core:arena",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//src/core:error",
         "//src/core:pollset_set",
@@ -3119,6 +3121,7 @@ grpc_cc_library(
         "ref_counted_ptr",
         "tsi_base",
         "tsi_ssl_session_cache",
+        "//src/core:channel_args",
         "//src/core:error",
         "//src/core:grpc_transport_chttp2_alpn",
         "//src/core:ref_counted",
@@ -3163,6 +3166,7 @@ grpc_cc_library(
         "//src/core:arena",
         "//src/core:arena_promise",
         "//src/core:basic_seq",
+        "//src/core:channel_args",
         "//src/core:channel_fwd",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",
@@ -3526,6 +3530,7 @@ grpc_cc_library(
         "//src/core:arena",
         "//src/core:bdp_estimator",
         "//src/core:bitset",
+        "//src/core:channel_args",
         "//src/core:chttp2_flow_control",
         "//src/core:closure",
         "//src/core:error",

src/core/BUILD

@@ -2187,6 +2187,9 @@ grpc_cc_library(
         "absl/types:variant",
     ],
     language = "c++",
+    visibility = [
+        "@grpc:alt_grpc_base_legacy",
+    ],
     deps = [
         "avl",
         "channel_stack_type",
@@ -2481,6 +2484,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "closure",
         "error",
         "iomgr_fwd",
@@ -2517,6 +2521,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "closure",
         "error",
         "iomgr_fwd",
@@ -2570,6 +2575,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "closure",
         "error",
         "grpc_sockaddr",
@@ -2612,6 +2618,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "closure",
         "error",
         "iomgr_fwd",
@@ -2650,6 +2657,7 @@ grpc_cc_library(
     language = "c++",
     tags = ["nofixdeps"],
     deps = [
+        "channel_args",
         "closure",
         "env",
         "error",
@@ -2725,6 +2733,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "closure",
         "error",
         "iomgr_fwd",
@@ -2891,6 +2900,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "closure",
         "error",
         "iomgr_fwd",
@@ -3227,6 +3237,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "channel_fwd",
         "context",
         "grpc_service_config",
@@ -3316,6 +3327,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "channel_fwd",
         "channel_init",
         "channel_stack_type",
@@ -3393,6 +3405,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "closure",
         "dual_ref_counted",
         "error",
@@ -3509,6 +3522,7 @@ grpc_cc_library(
     deps = [
         "certificate_provider_factory",
         "certificate_provider_registry",
+        "channel_args",
         "channel_creds_registry",
         "channel_fwd",
         "closure",
@@ -3735,6 +3749,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "error",
         "grpc_matchers",
         "grpc_outlier_detection_header",
@@ -3980,6 +3995,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "dual_ref_counted",
         "gpr_manual_constructor",
         "iomgr_fwd",
@@ -4042,6 +4058,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "closure",
         "error",
         "grpc_lb_subchannel_list",
@@ -4081,6 +4098,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "grpc_lb_subchannel_list",
         "json",
         "lb_policy",
@@ -4260,6 +4278,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena_promise",
+        "channel_args",
         "channel_fwd",
         "channel_stack_type",
         "context",
@@ -4343,6 +4362,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "grpc_resolver_dns_selection",
         "polling_resolver",
         "resolved_address",
@@ -4372,6 +4392,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "iomgr_port",
         "resolved_address",
         "//:config",
@@ -4442,6 +4463,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena",
+        "channel_args",
         "channel_fwd",
         "dual_ref_counted",
         "error",
@@ -4486,6 +4508,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "closure",
         "env",
         "error",
@@ -4631,6 +4654,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "channel_args_preconditioning",
         "channel_stack_type",
         "closure",
@@ -4679,6 +4703,7 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        "channel_args",
         "closure",
         "error",
         "grpc_insecure_credentials",
@@ -4728,6 +4753,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena",
+        "channel_args",
         "channel_args_preconditioning",
         "channel_stack_type",
         "closure",

src/core/ext/transport/cronet/BUILD

@@ -49,6 +49,7 @@ grpc_cc_library(
     deps = [
         "//:grpc_base",
         "//:grpc_transport_chttp2",
+        "//src/core:channel_args",
         "//src/core:closure",
     ],
 )

test/core/bad_connection/BUILD

@@ -28,6 +28,7 @@ grpc_cc_binary(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )

test/core/channel/BUILD

@@ -28,6 +28,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -42,6 +43,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -74,6 +76,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -89,6 +92,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/cpp/util:channel_trace_proto_helper",
     ],
@@ -105,6 +109,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/cpp/util:channel_trace_proto_helper",
     ],

test/core/client_channel/BUILD

@@ -39,6 +39,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -69,6 +70,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -83,6 +85,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -97,6 +100,7 @@ grpc_cc_test(
     tags = ["no_test_ios"],
     deps = [
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -111,6 +115,7 @@ grpc_cc_test(
     tags = ["no_test_ios"],
     deps = [
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/core/util:scoped_env_var",
     ],

test/core/client_channel/lb_policy/BUILD

@@ -44,6 +44,7 @@ grpc_cc_test(
     language = "C++",
     deps = [
         ":lb_policy_test_lib",
+        "//src/core:channel_args",
         "//src/core:grpc_lb_policy_pick_first",
         "//test/core/util:grpc_test_util",
     ],
@@ -56,6 +57,7 @@ grpc_cc_test(
     language = "C++",
     deps = [
         ":lb_policy_test_lib",
+        "//src/core:channel_args",
         "//src/core:grpc_lb_policy_outlier_detection",
         "//test/core/util:grpc_test_util",
     ],

test/core/client_channel/resolvers/BUILD

@@ -53,6 +53,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//test/core/util:grpc_test_util",
     ],
@@ -79,6 +80,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc_resolver_fake",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )

test/core/compression/BUILD

@@ -33,6 +33,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )

test/core/end2end/BUILD

@@ -69,6 +69,7 @@ grpc_cc_library(
         "//:grpc",
         "//:httpcli",
         "//:sockaddr_utils",
+        "//src/core:channel_args",
         "//src/core:channel_args_preconditioning",
         "//src/core:closure",
         "//src/core:default_event_engine",
@@ -92,6 +93,7 @@ grpc_cc_library(
         "//:gpr",
         "//:grpc",
         "//:grpc_public_hdrs",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -185,6 +187,7 @@ grpc_cc_test(
         "//:grpc_public_hdrs",
         "//:grpc_resolver_dns_ares",
         "//:server_address",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//src/core:default_event_engine",
         "//src/core:error",
@@ -271,6 +274,7 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc_public_hdrs",
         "//:tsi_ssl_credentials",
+        "//src/core:channel_args",
         "//src/core:error",
         "//src/core:useful",
         "//test/core/util:grpc_test_util",

test/core/end2end/fuzzers/BUILD

@@ -38,6 +38,7 @@ grpc_proto_fuzzer(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//src/core:slice",
         "//test/core/end2end:ssl_test_data",
@@ -58,6 +59,7 @@ grpc_fuzzer(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/event_engine/fuzzing_event_engine",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",
@@ -75,6 +77,7 @@ grpc_fuzzer(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",
     ],

test/core/event_engine/BUILD

@@ -73,6 +73,7 @@ grpc_cc_test(
     deps = [
         "//:gpr_platform",
         "//:grpc",
+        "//src/core:channel_args",
     ],
 )
 

test/core/event_engine/posix/BUILD

@@ -224,6 +224,7 @@ grpc_cc_test(
     uses_event_engine = True,
     uses_polling = True,
     deps = [
+        "//src/core:channel_args",
         "//src/core:event_engine_poller",
         "//src/core:posix_event_engine",
         "//src/core:posix_event_engine_closure",

test/core/event_engine/test_suite/BUILD

@@ -46,7 +46,10 @@ grpc_cc_library(
     testonly = True,
     srcs = ["client_test.cc"],
     hdrs = COMMON_HEADERS,
-    deps = [":conformance_test_base_lib"],
+    deps = [
+        ":conformance_test_base_lib",
+        "//src/core:channel_args",
+    ],
     alwayslink = 1,
 )
 
@@ -55,7 +58,10 @@ grpc_cc_library(
     testonly = True,
     srcs = ["server_test.cc"],
     hdrs = COMMON_HEADERS,
-    deps = [":conformance_test_base_lib"],
+    deps = [
+        ":conformance_test_base_lib",
+        "//src/core:channel_args",
+    ],
     alwayslink = 1,
 )
 

test/core/filters/BUILD

@@ -29,6 +29,7 @@ grpc_cc_test(
     deps = [
         "//:grpc",
         "//:grpc_security_base",
+        "//src/core:channel_args",
         "//test/core/promise:test_context",
     ],
 )
@@ -58,6 +59,7 @@ grpc_proto_fuzzer(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//test/core/end2end:ssl_test_data",
         "//test/core/util:grpc_test_util",

test/core/handshake/BUILD

@@ -82,6 +82,7 @@ grpc_cc_test(
         ":server_ssl_common",
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//test/core/util:grpc_test_util",
     ],

test/core/http/BUILD

@@ -114,6 +114,7 @@ grpc_cc_test(
         ":httpcli_test_util",
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//test/core/end2end:ssl_test_data",
         "//test/core/util:fake_udp_and_tcp_server",

test/core/iomgr/BUILD

@@ -250,6 +250,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",
     ],
@@ -268,6 +269,7 @@ grpc_cc_test(
         ":endpoint_tests",
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:slice",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",

test/core/memory_usage/BUILD

@@ -56,6 +56,7 @@ grpc_cc_binary(
         ":memstats",
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",
     ],
@@ -78,6 +79,7 @@ grpc_cc_binary(
         ":memstats",
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/end2end:ssl_test_data",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",

test/core/message_size/BUILD

@@ -28,6 +28,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )

test/core/security/BUILD

@@ -100,6 +100,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",
     ],
@@ -338,6 +339,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",
     ],

test/core/server_config_selector/BUILD

@@ -30,6 +30,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:grpc_server_config_selector",
         "//test/core/util:grpc_test_util",
     ],

test/core/service_config/BUILD

@@ -28,6 +28,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )

test/core/surface/BUILD

@@ -111,6 +111,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -152,6 +153,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -166,6 +168,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -178,6 +181,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )

test/core/transport/binder/end2end/BUILD

@@ -68,6 +68,7 @@ grpc_cc_library(
         "//:grpc++_base",
         "//:grpc++_binder",
         "//:grpc_base",
+        "//src/core:channel_args",
     ],
 )
 

test/core/transport/chttp2/BUILD

@@ -163,6 +163,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//src/core:slice",
         "//test/core/end2end:cq_verifier",
@@ -240,6 +241,7 @@ grpc_cc_test(
         "//:channel_stack_builder",
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:closure",
         "//src/core:slice",
         "//test/core/end2end:cq_verifier",
@@ -275,6 +277,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//src/core:channel_args",
         "//test/core/end2end:cq_verifier",
         "//test/core/util:grpc_test_util",
         "//test/cpp/util:test_config",
@@ -318,6 +321,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )
@@ -332,6 +336,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
     ],
 )

test/core/util/BUILD

@@ -305,6 +305,7 @@ grpc_cc_library(
         "//:ref_counted_ptr",
         "//:server_address",
         "//:uri_parser",
+        "//src/core:channel_args",
         "//src/core:error",
         "//src/core:grpc_backend_metric_data",
         "//src/core:json",

test/core/xds/BUILD

@@ -86,6 +86,7 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc_base",
         "//:grpc_opencensus_plugin",
+        "//src/core:channel_args",
         "//src/core:grpc_xds_channel_stack_modifier",
         "//test/core/util:grpc_test_util",
     ],
@@ -300,6 +301,7 @@ grpc_cc_test(
     deps = [
         "//:gpr",
         "//:grpc",
+        "//src/core:channel_args",
         "//src/core:grpc_xds_client",
         "//src/proto/grpc/testing/xds/v3:endpoint_proto",
         "//test/core/util:grpc_test_util",

test/cpp/client/BUILD

@@ -80,6 +80,7 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc++",
         "//:grpc_resolver_fake",
+        "//src/core:channel_args",
         "//test/core/util:grpc_test_util",
         "//test/cpp/util:test_util",
     ],

test/cpp/end2end/BUILD

@@ -497,6 +497,7 @@ grpc_cc_test(
         "//:grpc++",
         "//:grpcpp_orca_interceptor",
         "//:grpcpp_orca_service",
+        "//src/core:channel_args",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
         "//src/proto/grpc/testing/duplicate:echo_duplicate_proto",
@@ -523,6 +524,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//src/core:channel_args",
         "//src/proto/grpc/lookup/v1:rls_proto",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
@@ -545,6 +547,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//src/core:channel_args",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
         "//src/proto/grpc/testing/duplicate:echo_duplicate_proto",
@@ -568,6 +571,7 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc++",
         "//:grpc_resolver_fake",
+        "//src/core:channel_args",
         "//src/proto/grpc/lb/v1:load_balancer_proto",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",

test/cpp/end2end/xds/BUILD

@@ -108,6 +108,7 @@ grpc_cc_test(
         "//:grpc",
         "//:grpc++",
         "//:grpc_resolver_fake",
+        "//src/core:channel_args",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
         "//src/proto/grpc/testing/duplicate:echo_duplicate_proto",

test/cpp/microbenchmarks/BUILD

@@ -216,7 +216,10 @@ grpc_cc_test(
     ],
     uses_event_engine = False,
     uses_polling = False,
-    deps = [":helpers"],
+    deps = [
+        ":helpers",
+        "//src/core:channel_args",
+    ],
 )
 
 grpc_cc_test(

test/cpp/naming/BUILD

@@ -42,6 +42,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//src/core:channel_args",
         "//test/core/end2end:cq_verifier",
         "//test/core/util:fake_udp_and_tcp_server",
         "//test/core/util:grpc_test_util",

test/cpp/performance/BUILD

@@ -29,6 +29,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//src/core:channel_args",
         "//src/proto/grpc/testing:echo_proto",
         "//test/core/util:grpc_test_util",
         "//test/core/util:grpc_test_util_base",