BUILD files changes for bazel

23 files changed, 146 insertions, 142 deletions

diff --git a/test/core/backoff/BUILD b/test/core/backoff/BUILD
index 4ae762007c..97a08aecd0 100644
--- a/test/core/backoff/BUILD
+++ b/test/core/backoff/BUILD
@@ -25,7 +25,7 @@ package(
 
 grpc_cc_test(
     name = "backoff_test",
-    srcs = ["backoff_test.c"],
+    srcs = ["backoff_test.cc"],
     language = "C",
     deps = [
         "//:grpc",
diff --git a/test/core/census/BUILD b/test/core/census/BUILD
index 24fd2807d0..52d0b772d1 100644
--- a/test/core/census/BUILD
+++ b/test/core/census/BUILD
@@ -20,7 +20,7 @@ licenses(["notice"])  # Apache v2
 
 grpc_cc_test(
     name = "context_test",
-    srcs = ["context_test.c"],
+    srcs = ["context_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -32,7 +32,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "mlog_test",
-    srcs = ["mlog_test.c"],
+    srcs = ["mlog_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -44,7 +44,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "resource_test",
-    srcs = ["resource_test.c"],
+    srcs = ["resource_test.cc"],
     language = "C",
     data = [
         ":data/resource_empty_name.pb",
@@ -64,7 +64,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "trace_context_test",
-    srcs = ["trace_context_test.c"],
+    srcs = ["trace_context_test.cc"],
     language = "C",
     data = [
         ":data/context_empty.pb",
diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD
index 5ac77c449b..14e45bf3c7 100644
--- a/test/core/channel/BUILD
+++ b/test/core/channel/BUILD
@@ -20,7 +20,7 @@ licenses(["notice"])  # Apache v2
 
 grpc_cc_test(
     name = "channel_args_test",
-    srcs = ["channel_args_test.c"],
+    srcs = ["channel_args_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -32,7 +32,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "channel_stack_test",
-    srcs = ["channel_stack_test.c"],
+    srcs = ["channel_stack_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -44,7 +44,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "channel_stack_builder_test",
-    srcs = ["channel_stack_builder_test.c"],
+    srcs = ["channel_stack_builder_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD
index c4a93238f2..75628413c5 100644
--- a/test/core/client_channel/BUILD
+++ b/test/core/client_channel/BUILD
@@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_fuzzer(
     name = "uri_fuzzer_test",
-    srcs = ["uri_fuzzer_test.c"],
+    srcs = ["uri_fuzzer_test.cc"],
     language = "C",
     corpus = "uri_corpus",
     deps = [
@@ -34,7 +34,7 @@ grpc_fuzzer(
 
 grpc_cc_test(
     name = "lb_policies_test",
-    srcs = ["lb_policies_test.c"],
+    srcs = ["lb_policies_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/client_channel/lb_policies_test.cc b/test/core/client_channel/lb_policies_test.cc
index aa0e1ba14d..25b896697e 100644
--- a/test/core/client_channel/lb_policies_test.cc
+++ b/test/core/client_channel/lb_policies_test.cc
@@ -234,8 +234,8 @@ static request_sequences request_sequences_create(size_t n) {
   res.n = n;
   res.connections =
       static_cast<int *>(gpr_malloc(sizeof(*res.connections) * n));
-  res.connectivity_states =
-      static_cast<grpc_connectivity_state *>(gpr_malloc(sizeof(*res.connectivity_states) * n));
+  res.connectivity_states = static_cast<grpc_connectivity_state *>(
+      gpr_malloc(sizeof(*res.connectivity_states) * n));
   memset(res.connections, 0, sizeof(*res.connections) * n);
   memset(res.connectivity_states, 0, sizeof(*res.connectivity_states) * n);
   return res;
diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD
index 0907e06623..ae3ce0b257 100644
--- a/test/core/client_channel/resolvers/BUILD
+++ b/test/core/client_channel/resolvers/BUILD
@@ -20,7 +20,7 @@ licenses(["notice"])  # Apache v2
 
 grpc_cc_test(
     name = "dns_resolver_connectivity_test",
-    srcs = ["dns_resolver_connectivity_test.c"],
+    srcs = ["dns_resolver_connectivity_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -32,7 +32,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "dns_resolver_test",
-    srcs = ["dns_resolver_test.c"],
+    srcs = ["dns_resolver_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -44,7 +44,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "sockaddr_resolver_test",
-    srcs = ["sockaddr_resolver_test.c"],
+    srcs = ["sockaddr_resolver_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -56,7 +56,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "fake_resolver_test",
-    srcs = ["fake_resolver_test.c"],
+    srcs = ["fake_resolver_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/compression/BUILD b/test/core/compression/BUILD
index 1ab6e35f0d..60453fc036 100644
--- a/test/core/compression/BUILD
+++ b/test/core/compression/BUILD
@@ -20,7 +20,7 @@ licenses(["notice"])  # Apache v2
 
 grpc_cc_test(
     name = "algorithm_test",
-    srcs = ["algorithm_test.c"],
+    srcs = ["algorithm_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -32,7 +32,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "compression_test",
-    srcs = ["compression_test.c"],
+    srcs = ["compression_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -44,7 +44,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "message_compress_test",
-    srcs = ["message_compress_test.c"],
+    srcs = ["message_compress_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/fling/BUILD b/test/core/fling/BUILD
index 27b2b5bec6..beacae7a75 100644
--- a/test/core/fling/BUILD
+++ b/test/core/fling/BUILD
@@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 grpc_cc_binary(
     name = "client",
     testonly = 1,
-    srcs = ["client.c"],
+    srcs = ["client.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -37,7 +37,7 @@ grpc_cc_binary(
 grpc_cc_binary(
     name = "server",
     testonly = 1,
-    srcs = ["server.c"],
+    srcs = ["server.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -50,7 +50,7 @@ grpc_cc_binary(
 
 grpc_cc_test(
     name = "fling",
-    srcs = ["fling_test.c"],
+    srcs = ["fling_test.cc"],
     data = [
         ":client",
         ":server",
@@ -66,7 +66,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "fling_stream",
-    srcs = ["fling_stream_test.c"],
+    srcs = ["fling_stream_test.cc"],
     data = [
         ":client",
         ":server",
diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD
index 8e462cfc5b..a2ac501927 100644
--- a/test/core/handshake/BUILD
+++ b/test/core/handshake/BUILD
@@ -20,7 +20,7 @@ licenses(["notice"])  # Apache v2
 
 grpc_cc_test(
     name = "client_ssl",
-    srcs = ["client_ssl.c"],
+    srcs = ["client_ssl.cc"],
     language = "C",
     data = [
         "//src/core/tsi/test_creds:ca.pem",
@@ -37,7 +37,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "server_ssl",
-    srcs = ["server_ssl.c"],
+    srcs = ["server_ssl.cc"],
     language = "C",
     data = [
         "//src/core/tsi/test_creds:ca.pem",
diff --git a/test/core/http/BUILD b/test/core/http/BUILD
index fffdac5e08..4dbba73f31 100644
--- a/test/core/http/BUILD
+++ b/test/core/http/BUILD
@@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_fuzzer(
     name = "response_fuzzer",
-    srcs = ["response_fuzzer.c"],
+    srcs = ["response_fuzzer.cc"],
     language = "C",
     corpus = "response_corpus",
     deps = [
@@ -34,7 +34,7 @@ grpc_fuzzer(
 
 grpc_fuzzer(
     name = "request_fuzzer",
-    srcs = ["request_fuzzer.c"],
+    srcs = ["request_fuzzer.cc"],
     language = "C",
     corpus = "request_corpus",
     deps = [
@@ -64,7 +64,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_cc_test(
     name = "httpcli_test",
-    srcs = ["httpcli_test.c"],
+    srcs = ["httpcli_test.cc"],
     language = "C",
     data = ["test_server.py"],
     deps = [
@@ -78,7 +78,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "httpscli_test",
-    srcs = ["httpscli_test.c"],
+    srcs = ["httpscli_test.cc"],
     language = "C",
     data = ["test_server.py"],
     deps = [
@@ -92,7 +92,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "parser_test",
-    srcs = ["parser_test.c"],
+    srcs = ["parser_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD
index 7620d1de21..b4490e7a5f 100644
--- a/test/core/iomgr/BUILD
+++ b/test/core/iomgr/BUILD
@@ -22,7 +22,7 @@ grpc_package(name = "test/core/iomgr", visibility = "public") # Useful for third
 
 grpc_cc_library(
     name = "endpoint_tests",
-    srcs = ["endpoint_tests.c"],
+    srcs = ["endpoint_tests.cc"],
     hdrs = ["endpoint_tests.h"],
     language = "C",
     visibility = ["//test:__subpackages__"],
@@ -36,7 +36,7 @@ grpc_cc_library(
 
 grpc_cc_test(
     name = "combiner_test",
-    srcs = ["combiner_test.c"],
+    srcs = ["combiner_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -48,7 +48,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "endpoint_pair_test",
-    srcs = ["endpoint_pair_test.c"],
+    srcs = ["endpoint_pair_test.cc"],
     language = "C",
     deps = [
         ":endpoint_tests",
@@ -61,7 +61,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "ev_epollsig_linux_test",
-    srcs = ["ev_epollsig_linux_test.c"],
+    srcs = ["ev_epollsig_linux_test.cc"],
     deps = [
         "//:gpr",
         "//:grpc",
@@ -73,7 +73,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "fd_conservation_posix_test",
-    srcs = ["fd_conservation_posix_test.c"],
+    srcs = ["fd_conservation_posix_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -85,7 +85,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "fd_posix_test",
-    srcs = ["fd_posix_test.c"],
+    srcs = ["fd_posix_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -97,7 +97,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "load_file_test",
-    srcs = ["load_file_test.c"],
+    srcs = ["load_file_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -109,7 +109,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "pollset_set_test",
-    srcs = ["pollset_set_test.c"],
+    srcs = ["pollset_set_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -121,7 +121,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "resolve_address_posix_test",
-    srcs = ["resolve_address_posix_test.c"],
+    srcs = ["resolve_address_posix_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -133,7 +133,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "resolve_address_test",
-    srcs = ["resolve_address_test.c"],
+    srcs = ["resolve_address_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -145,7 +145,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "resource_quota_test",
-    srcs = ["resource_quota_test.c"],
+    srcs = ["resource_quota_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -157,7 +157,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "sockaddr_utils_test",
-    srcs = ["sockaddr_utils_test.c"],
+    srcs = ["sockaddr_utils_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -169,7 +169,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "socket_utils_test",
-    srcs = ["socket_utils_test.c"],
+    srcs = ["socket_utils_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -181,7 +181,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "tcp_client_posix_test",
-    srcs = ["tcp_client_posix_test.c"],
+    srcs = ["tcp_client_posix_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -193,7 +193,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "tcp_posix_test",
-    srcs = ["tcp_posix_test.c"],
+    srcs = ["tcp_posix_test.cc"],
     language = "C",
     deps = [
         ":endpoint_tests",
@@ -206,7 +206,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "tcp_server_posix_test",
-    srcs = ["tcp_server_posix_test.c"],
+    srcs = ["tcp_server_posix_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -218,7 +218,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "time_averaged_stats_test",
-    srcs = ["time_averaged_stats_test.c"],
+    srcs = ["time_averaged_stats_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -230,7 +230,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "timer_heap_test",
-    srcs = ["timer_heap_test.c"],
+    srcs = ["timer_heap_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -242,7 +242,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "timer_list_test",
-    srcs = ["timer_list_test.c"],
+    srcs = ["timer_list_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -254,7 +254,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "udp_server_test",
-    srcs = ["udp_server_test.c"],
+    srcs = ["udp_server_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -266,7 +266,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "wakeup_fd_cv_test",
-    srcs = ["wakeup_fd_cv_test.c"],
+    srcs = ["wakeup_fd_cv_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/json/BUILD b/test/core/json/BUILD
index 3ff7918677..6e92fdc069 100644
--- a/test/core/json/BUILD
+++ b/test/core/json/BUILD
@@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_fuzzer(
     name = "json_fuzzer",
-    srcs = ["fuzzer.c"],
+    srcs = ["fuzzer.cc"],
     language = "C",
     corpus = "corpus",
     deps = [
@@ -35,7 +35,7 @@ grpc_fuzzer(
 grpc_cc_binary(
     name = "json_rewrite",
     testonly = 1,
-    srcs = ["json_rewrite.c"],
+    srcs = ["json_rewrite.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -47,7 +47,7 @@ grpc_cc_binary(
 
 grpc_cc_test(
     name = "json_rewrite_test",
-    srcs = ["json_rewrite_test.c"],
+    srcs = ["json_rewrite_test.cc"],
     language = "C",
     data = [
         "rewrite_test_input.json",
@@ -65,7 +65,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "json_stream_error_test",
-    srcs = ["json_stream_error_test.c"],
+    srcs = ["json_stream_error_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -77,7 +77,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "json_test",
-    srcs = ["json_test.c"],
+    srcs = ["json_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/nanopb/BUILD b/test/core/nanopb/BUILD
index f332207e2d..a814cd3411 100644
--- a/test/core/nanopb/BUILD
+++ b/test/core/nanopb/BUILD
@@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_fuzzer(
     name = "fuzzer_response",
-    srcs = ["fuzzer_response.c"],
+    srcs = ["fuzzer_response.cc"],
     language = "C",
     corpus = "corpus_response",
     deps = [
@@ -34,7 +34,7 @@ grpc_fuzzer(
 
 grpc_fuzzer(
     name = "fuzzer_serverlist",
-    srcs = ["fuzzer_serverlist.c"],
+    srcs = ["fuzzer_serverlist.cc"],
     language = "C",
     corpus = "corpus_serverlist",
     deps = [
diff --git a/test/core/network_benchmarks/BUILD b/test/core/network_benchmarks/BUILD
index 0e15393030..0db3ad7940 100644
--- a/test/core/network_benchmarks/BUILD
+++ b/test/core/network_benchmarks/BUILD
@@ -22,7 +22,7 @@ licenses(["notice"])  # Apache v2
 
 grpc_cc_binary(
     name = "low_level_ping_pong",
-    srcs = ["low_level_ping_pong.c"],
+    srcs = ["low_level_ping_pong.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc
index acd84aaa09..8aed0bccbd 100644
--- a/test/core/network_benchmarks/low_level_ping_pong.cc
+++ b/test/core/network_benchmarks/low_level_ping_pong.cc
@@ -594,8 +594,10 @@ static int run_all_benchmarks(size_t msg_size) {
     test_strategy *strategy = &test_strategies[i];
     size_t j;
     for (j = 0; j < GPR_ARRAY_SIZE(socket_types); ++j) {
-      thread_args *client_args = static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
-      thread_args *server_args = static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
+      thread_args *client_args =
+          static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
+      thread_args *server_args =
+          static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
       char *socket_type = socket_types[j];
 
       client_args->read_bytes = strategy->read_strategy;
@@ -618,8 +620,10 @@ static int run_all_benchmarks(size_t msg_size) {
 }
 
 int main(int argc, char **argv) {
-  thread_args *client_args = static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
-  thread_args *server_args = static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
+  thread_args *client_args =
+      static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
+  thread_args *server_args =
+      static_cast<thread_args *>(gpr_malloc(sizeof(thread_args)));
   int msg_size = -1;
   const char *read_strategy = NULL;
   const char *socket_type = NULL;
diff --git a/test/core/security/BUILD b/test/core/security/BUILD
index 83b1747648..e771465be2 100644
--- a/test/core/security/BUILD
+++ b/test/core/security/BUILD
@@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_fuzzer(
     name = "ssl_server_fuzzer",
-    srcs = ["ssl_server_fuzzer.c"],
+    srcs = ["ssl_server_fuzzer.cc"],
     language = "C",
     corpus = "corpus",
     deps = [
@@ -35,7 +35,7 @@ grpc_fuzzer(
 
 grpc_cc_library(
     name = "oauth2_utils",
-    srcs = ["oauth2_utils.c"],
+    srcs = ["oauth2_utils.cc"],
     hdrs = ["oauth2_utils.h"],
     language = "C",
     deps = ["//:grpc"],
@@ -44,7 +44,7 @@ grpc_cc_library(
 
 grpc_cc_test(
     name = "auth_context_test",
-    srcs = ["auth_context_test.c"],
+    srcs = ["auth_context_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -56,7 +56,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "credentials_test",
-    srcs = ["credentials_test.c"],
+    srcs = ["credentials_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -68,7 +68,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "secure_endpoint_test",
-    srcs = ["secure_endpoint_test.c"],
+    srcs = ["secure_endpoint_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -81,7 +81,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "security_connector_test",
-    srcs = ["security_connector_test.c"],
+    srcs = ["security_connector_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -93,7 +93,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "ssl_credentials_test",
-    srcs = ["ssl_credentials_test.c"],
+    srcs = ["ssl_credentials_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -105,7 +105,7 @@ grpc_cc_test(
 
 grpc_cc_binary(
     name = "create_jwt",
-    srcs = ["create_jwt.c"],
+    srcs = ["create_jwt.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -115,7 +115,7 @@ grpc_cc_binary(
 
 grpc_cc_binary(
     name = "fetch_oauth2",
-    srcs = ["fetch_oauth2.c"],
+    srcs = ["fetch_oauth2.cc"],
     language = "C",
     deps = [
         ":oauth2_utils",
@@ -126,7 +126,7 @@ grpc_cc_binary(
 
 grpc_cc_binary(
     name = "verify_jwt",
-    srcs = ["verify_jwt.c"],
+    srcs = ["verify_jwt.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD
index ad2308a4d6..d7bcc37f6b 100644
--- a/test/core/slice/BUILD
+++ b/test/core/slice/BUILD
@@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_fuzzer(
     name = "percent_encode_fuzzer",
-    srcs = ["percent_encode_fuzzer.c"],
+    srcs = ["percent_encode_fuzzer.cc"],
     language = "C",
     corpus = "percent_encode_corpus",
     deps = [
@@ -34,7 +34,7 @@ grpc_fuzzer(
 
 grpc_fuzzer(
     name = "percent_decode_fuzzer",
-    srcs = ["percent_decode_fuzzer.c"],
+    srcs = ["percent_decode_fuzzer.cc"],
     language = "C",
     corpus = "percent_decode_corpus",
     deps = [
@@ -46,7 +46,7 @@ grpc_fuzzer(
 
 grpc_cc_test(
     name = "percent_encoding_test",
-    srcs = ["percent_encoding_test.c"],
+    srcs = ["percent_encoding_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -58,14 +58,14 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "slice_test",
-    srcs = ["slice_test.c"],
+    srcs = ["slice_test.cc"],
     deps = ["//:grpc", "//test/core/util:grpc_test_util", "//:gpr", "//test/core/util:gpr_test_util"],
     language = "C",
 )
 
 grpc_cc_test(
     name = "slice_string_helpers_test",
-    srcs = ["slice_string_helpers_test.c"],
+    srcs = ["slice_string_helpers_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -77,21 +77,21 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "slice_buffer_test",
-    srcs = ["slice_buffer_test.c"],
+    srcs = ["slice_buffer_test.cc"],
     deps = ["//:grpc", "//test/core/util:grpc_test_util", "//:gpr", "//test/core/util:gpr_test_util"],
     language = "C",
 )
 
 grpc_cc_test(
     name = "slice_hash_table_test",
-    srcs = ["slice_hash_table_test.c"],
+    srcs = ["slice_hash_table_test.cc"],
     deps = ["//:grpc", "//test/core/util:grpc_test_util", "//:gpr", "//test/core/util:gpr_test_util"],
     language = "C",
 )
 
 grpc_cc_test(
     name = "b64_test",
-    srcs = ["b64_test.c"],
+    srcs = ["b64_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/support/BUILD b/test/core/support/BUILD
index 3bdc1c4186..c1edb7ee8a 100644
--- a/test/core/support/BUILD
+++ b/test/core/support/BUILD
@@ -20,7 +20,7 @@ grpc_package(name = "test/core/support")
 
 grpc_cc_test(
     name = "alloc_test",
-    srcs = ["alloc_test.c"],
+    srcs = ["alloc_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -30,7 +30,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "avl_test",
-    srcs = ["avl_test.c"],
+    srcs = ["avl_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -40,7 +40,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "cmdline_test",
-    srcs = ["cmdline_test.c"],
+    srcs = ["cmdline_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -50,7 +50,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "cpu_test",
-    srcs = ["cpu_test.c"],
+    srcs = ["cpu_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -60,7 +60,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "env_test",
-    srcs = ["env_test.c"],
+    srcs = ["env_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -70,7 +70,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "histogram_test",
-    srcs = ["histogram_test.c"],
+    srcs = ["histogram_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -80,7 +80,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "host_port_test",
-    srcs = ["host_port_test.c"],
+    srcs = ["host_port_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -90,7 +90,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "log_test",
-    srcs = ["log_test.c"],
+    srcs = ["log_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -100,7 +100,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "mpscq_test",
-    srcs = ["mpscq_test.c"],
+    srcs = ["mpscq_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -110,7 +110,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "murmur_hash_test",
-    srcs = ["murmur_hash_test.c"],
+    srcs = ["murmur_hash_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -120,7 +120,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "stack_lockfree_test",
-    srcs = ["stack_lockfree_test.c"],
+    srcs = ["stack_lockfree_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -130,7 +130,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "string_test",
-    srcs = ["string_test.c"],
+    srcs = ["string_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -140,7 +140,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "spinlock_test",
-    srcs = ["spinlock_test.c"],
+    srcs = ["spinlock_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -150,7 +150,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "sync_test",
-    srcs = ["sync_test.c"],
+    srcs = ["sync_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -160,7 +160,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "thd_test",
-    srcs = ["thd_test.c"],
+    srcs = ["thd_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -170,7 +170,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "time_test",
-    srcs = ["time_test.c"],
+    srcs = ["time_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -180,7 +180,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "tls_test",
-    srcs = ["tls_test.c"],
+    srcs = ["tls_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -190,7 +190,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "useful_test",
-    srcs = ["useful_test.c"],
+    srcs = ["useful_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/surface/BUILD b/test/core/surface/BUILD
index 17db7737f7..3514278113 100644
--- a/test/core/surface/BUILD
+++ b/test/core/surface/BUILD
@@ -20,7 +20,7 @@ grpc_package(name = "test/core/surface")
 
 grpc_cc_test(
     name = "alarm_test",
-    srcs = ["alarm_test.c"],
+    srcs = ["alarm_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -32,7 +32,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "grpc_byte_buffer_reader_test",
-    srcs = ["byte_buffer_reader_test.c"],
+    srcs = ["byte_buffer_reader_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -44,7 +44,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "channel_create_test",
-    srcs = ["channel_create_test.c"],
+    srcs = ["channel_create_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -56,7 +56,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "grpc_completion_queue_test",
-    srcs = ["completion_queue_test.c"],
+    srcs = ["completion_queue_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -68,7 +68,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "concurrent_connectivity_test",
-    srcs = ["concurrent_connectivity_test.c"],
+    srcs = ["concurrent_connectivity_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -80,7 +80,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "init_test",
-    srcs = ["init_test.c"],
+    srcs = ["init_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -92,7 +92,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "grpc_invalid_channel_args_test",
-    srcs = ["invalid_channel_args_test.c"],
+    srcs = ["invalid_channel_args_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -104,7 +104,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "lame_client_test",
-    srcs = ["lame_client_test.c"],
+    srcs = ["lame_client_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -129,7 +129,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "secure_channel_create_test",
-    srcs = ["secure_channel_create_test.c"],
+    srcs = ["secure_channel_create_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -141,7 +141,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "sequential_connectivity_test",
-    srcs = ["sequential_connectivity_test.c"],
+    srcs = ["sequential_connectivity_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -154,7 +154,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "server_chttp2_test",
-    srcs = ["server_chttp2_test.c"],
+    srcs = ["server_chttp2_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -166,7 +166,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "server_test",
-    srcs = ["server_test.c"],
+    srcs = ["server_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD
index edd27b8a5f..d49731a765 100644
--- a/test/core/transport/BUILD
+++ b/test/core/transport/BUILD
@@ -35,7 +35,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "byte_stream_test",
-    srcs = ["byte_stream_test.c"],
+    srcs = ["byte_stream_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -47,7 +47,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "connectivity_state_test",
-    srcs = ["connectivity_state_test.c"],
+    srcs = ["connectivity_state_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -59,7 +59,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "metadata_test",
-    srcs = ["metadata_test.c"],
+    srcs = ["metadata_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -86,7 +86,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "status_conversion_test",
-    srcs = ["status_conversion_test.c"],
+    srcs = ["status_conversion_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -98,7 +98,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "stream_owned_slice_test",
-    srcs = ["stream_owned_slice_test.c"],
+    srcs = ["stream_owned_slice_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -110,7 +110,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "timeout_encoding_test",
-    srcs = ["timeout_encoding_test.c"],
+    srcs = ["timeout_encoding_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD
index 6081940243..dbb3670856 100644
--- a/test/core/transport/chttp2/BUILD
+++ b/test/core/transport/chttp2/BUILD
@@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
 
 grpc_fuzzer(
     name = "hpack_parser_fuzzer",
-    srcs = ["hpack_parser_fuzzer_test.c"],
+    srcs = ["hpack_parser_fuzzer_test.cc"],
     corpus = "hpack_parser_corpus",
     deps = [
         "//:grpc",
@@ -32,7 +32,7 @@ grpc_fuzzer(
 
 grpc_cc_test(
     name = "alpn_test",
-    srcs = ["alpn_test.c"],
+    srcs = ["alpn_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -44,7 +44,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "bin_decoder_test",
-    srcs = ["bin_decoder_test.c"],
+    srcs = ["bin_decoder_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -56,7 +56,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "bin_encoder_test",
-    srcs = ["bin_encoder_test.c"],
+    srcs = ["bin_encoder_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -68,7 +68,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "hpack_encoder_test",
-    srcs = ["hpack_encoder_test.c"],
+    srcs = ["hpack_encoder_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -80,7 +80,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "hpack_parser_test",
-    srcs = ["hpack_parser_test.c"],
+    srcs = ["hpack_parser_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -92,7 +92,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "hpack_table_test",
-    srcs = ["hpack_table_test.c"],
+    srcs = ["hpack_table_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -104,7 +104,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "stream_map_test",
-    srcs = ["stream_map_test.c"],
+    srcs = ["stream_map_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
@@ -116,7 +116,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "varint_test",
-    srcs = ["varint_test.c"],
+    srcs = ["varint_test.cc"],
     language = "C",
     deps = [
         "//:gpr",
diff --git a/test/core/tsi/BUILD b/test/core/tsi/BUILD
index 0c5509dda6..84878be0dc 100644
--- a/test/core/tsi/BUILD
+++ b/test/core/tsi/BUILD
@@ -20,7 +20,7 @@ grpc_package(name = "test/core/tsi")
 
 grpc_cc_library(
     name = "transport_security_test_lib",
-    srcs = ["transport_security_test_lib.c"],
+    srcs = ["transport_security_test_lib.cc"],
     hdrs = ["transport_security_test_lib.h"],
     deps = [
         "//:grpc",
@@ -30,7 +30,7 @@ grpc_cc_library(
 
 grpc_cc_test(
     name = "fake_transport_security_test",
-    srcs = ["fake_transport_security_test.c"],
+    srcs = ["fake_transport_security_test.cc"],
     language = "C",
     deps = [
         ":transport_security_test_lib",
@@ -44,7 +44,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "ssl_transport_security_test",
-    srcs = ["ssl_transport_security_test.c"],
+    srcs = ["ssl_transport_security_test.cc"],
     data = [
         "//src/core/tsi/test_creds:badclient.key",
         "//src/core/tsi/test_creds:badclient.pem",
@@ -70,7 +70,7 @@ grpc_cc_test(
 
 grpc_cc_test(
     name = "transport_security_test",
-    srcs = ["transport_security_test.c"],
+    srcs = ["transport_security_test.cc"],
     language = "C",
     deps = [
         "//:grpc",
diff --git a/test/core/util/BUILD b/test/core/util/BUILD
index 5844a17728..7d8d7ded75 100644
--- a/test/core/util/BUILD
+++ b/test/core/util/BUILD
@@ -21,8 +21,8 @@ grpc_package(name = "test/core/util", visibility = "public")
 grpc_cc_library(
     name = "gpr_test_util",
     srcs = [
-        "memory_counters.c",
-        "test_config.c",
+        "memory_counters.cc",
+        "test_config.cc",
     ],
     hdrs = [
         "memory_counters.h",
@@ -48,16 +48,16 @@ grpc_cc_library(
 grpc_cc_library(
     name = "grpc_test_util_base",
     srcs = [
-        "grpc_profiler.c",
-        "mock_endpoint.c",
-        "parse_hexstring.c",
-        "passthru_endpoint.c",
-        "port.c",
-        "port_server_client.c",
-        "reconnect_server.c",
-        "slice_splitter.c",
-        "test_tcp_server.c",
-        "trickle_endpoint.c",
+        "grpc_profiler.cc",
+        "mock_endpoint.cc",
+        "parse_hexstring.cc",
+        "passthru_endpoint.cc",
+        "port.cc",
+        "port_server_client.cc",
+        "reconnect_server.cc",
+        "slice_splitter.cc",
+        "test_tcp_server.cc",
+        "trickle_endpoint.cc",
     ],
     hdrs = [
         "grpc_profiler.h",