convert connectivity_watcher to cpp file

7 years ago · f8ed4fa7f4
parent 6a48dc544e
commit f8ed4fa7f4
15 changed files with 55 additions and 25 deletions
--- a/1
+++ b/1
@ -872,6 +872,7 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_client_channel",
    srcs = [
+        "src/core/ext/filters/client_channel/channel_connectivity_internal.cc",
        "src/core/ext/filters/client_channel/channel_connectivity.cc",
        "src/core/ext/filters/client_channel/client_channel.cc",
        "src/core/ext/filters/client_channel/client_channel_factory.cc",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1154,10 +1154,11 @@ add_library(grpc
  src/core/ext/transport/chttp2/server/chttp2_server.cc
  src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
+  src/core/ext/filters/client_channel/channel_connectivity_internal.cc
  src/core/ext/filters/client_channel/client_channel.cc
  src/core/ext/filters/client_channel/client_channel_factory.cc
  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/connectivity_watcher.c
+  src/core/ext/filters/client_channel/connectivity_watcher.cc
  src/core/ext/filters/client_channel/connector.cc
  src/core/ext/filters/client_channel/http_connect_handshaker.cc
  src/core/ext/filters/client_channel/http_proxy.cc
@ -1479,10 +1480,11 @@ add_library(grpc_cronet
  src/core/ext/filters/http/message_compress/message_compress_filter.cc
  src/core/ext/filters/http/server/http_server_filter.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
+  src/core/ext/filters/client_channel/channel_connectivity_internal.cc
  src/core/ext/filters/client_channel/client_channel.cc
  src/core/ext/filters/client_channel/client_channel_factory.cc
  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/connectivity_watcher.c
+  src/core/ext/filters/client_channel/connectivity_watcher.cc
  src/core/ext/filters/client_channel/connector.cc
  src/core/ext/filters/client_channel/http_connect_handshaker.cc
  src/core/ext/filters/client_channel/http_proxy.cc
@ -1770,10 +1772,11 @@ add_library(grpc_test_util
  src/core/lib/transport/transport_op_string.cc
  src/core/lib/debug/trace.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
+  src/core/ext/filters/client_channel/channel_connectivity_internal.cc
  src/core/ext/filters/client_channel/client_channel.cc
  src/core/ext/filters/client_channel/client_channel_factory.cc
  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/connectivity_watcher.c
+  src/core/ext/filters/client_channel/connectivity_watcher.cc
  src/core/ext/filters/client_channel/connector.cc
  src/core/ext/filters/client_channel/http_connect_handshaker.cc
  src/core/ext/filters/client_channel/http_proxy.cc
@ -2036,10 +2039,11 @@ add_library(grpc_test_util_unsecure
  src/core/lib/transport/transport_op_string.cc
  src/core/lib/debug/trace.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
+  src/core/ext/filters/client_channel/channel_connectivity_internal.cc
  src/core/ext/filters/client_channel/client_channel.cc
  src/core/ext/filters/client_channel/client_channel_factory.cc
  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/connectivity_watcher.c
+  src/core/ext/filters/client_channel/connectivity_watcher.cc
  src/core/ext/filters/client_channel/connector.cc
  src/core/ext/filters/client_channel/http_connect_handshaker.cc
  src/core/ext/filters/client_channel/http_proxy.cc
@ -2321,10 +2325,11 @@ add_library(grpc_unsecure
  src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc
  src/core/ext/transport/chttp2/client/chttp2_connector.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
+  src/core/ext/filters/client_channel/channel_connectivity_internal.cc
  src/core/ext/filters/client_channel/client_channel.cc
  src/core/ext/filters/client_channel/client_channel_factory.cc
  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/connectivity_watcher.c
+  src/core/ext/filters/client_channel/connectivity_watcher.cc
  src/core/ext/filters/client_channel/connector.cc
  src/core/ext/filters/client_channel/http_connect_handshaker.cc
  src/core/ext/filters/client_channel/http_proxy.cc
@ -3057,10 +3062,11 @@ add_library(grpc++_cronet
  src/core/ext/filters/http/message_compress/message_compress_filter.cc
  src/core/ext/filters/http/server/http_server_filter.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
+  src/core/ext/filters/client_channel/channel_connectivity_internal.cc
  src/core/ext/filters/client_channel/client_channel.cc
  src/core/ext/filters/client_channel/client_channel_factory.cc
  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/connectivity_watcher.c
+  src/core/ext/filters/client_channel/connectivity_watcher.cc
  src/core/ext/filters/client_channel/connector.cc
  src/core/ext/filters/client_channel/http_connect_handshaker.cc
  src/core/ext/filters/client_channel/http_proxy.cc
--- a/18
+++ b/18
@ -3154,10 +3154,11 @@ LIBGRPC_SRC = \
    src/core/ext/transport/chttp2/server/chttp2_server.cc \
    src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
+    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
    src/core/ext/filters/client_channel/client_channel_factory.cc \
    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.c \
+    src/core/ext/filters/client_channel/connectivity_watcher.cc \
    src/core/ext/filters/client_channel/connector.cc \
    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
    src/core/ext/filters/client_channel/http_proxy.cc \
@ -3478,10 +3479,11 @@ LIBGRPC_CRONET_SRC = \
    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
    src/core/ext/filters/http/server/http_server_filter.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
+    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
    src/core/ext/filters/client_channel/client_channel_factory.cc \
    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.c \
+    src/core/ext/filters/client_channel/connectivity_watcher.cc \
    src/core/ext/filters/client_channel/connector.cc \
    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
    src/core/ext/filters/client_channel/http_proxy.cc \
@ -3767,10 +3769,11 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/lib/transport/transport_op_string.cc \
    src/core/lib/debug/trace.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
+    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
    src/core/ext/filters/client_channel/client_channel_factory.cc \
    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.c \
+    src/core/ext/filters/client_channel/connectivity_watcher.cc \
    src/core/ext/filters/client_channel/connector.cc \
    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
    src/core/ext/filters/client_channel/http_proxy.cc \
@ -4023,10 +4026,11 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    src/core/lib/transport/transport_op_string.cc \
    src/core/lib/debug/trace.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
+    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
    src/core/ext/filters/client_channel/client_channel_factory.cc \
    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.c \
+    src/core/ext/filters/client_channel/connectivity_watcher.cc \
    src/core/ext/filters/client_channel/connector.cc \
    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
    src/core/ext/filters/client_channel/http_proxy.cc \
@ -4285,10 +4289,11 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
+    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
    src/core/ext/filters/client_channel/client_channel_factory.cc \
    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.c \
+    src/core/ext/filters/client_channel/connectivity_watcher.cc \
    src/core/ext/filters/client_channel/connector.cc \
    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
    src/core/ext/filters/client_channel/http_proxy.cc \
@ -4999,10 +5004,11 @@ LIBGRPC++_CRONET_SRC = \
    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
    src/core/ext/filters/http/server/http_server_filter.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
+    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
    src/core/ext/filters/client_channel/client_channel_factory.cc \
    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.c \
+    src/core/ext/filters/client_channel/connectivity_watcher.cc \
    src/core/ext/filters/client_channel/connector.cc \
    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
    src/core/ext/filters/client_channel/http_proxy.cc \
--- a/binding.gyp
+++ b/binding.gyp
@ -854,10 +854,11 @@
        'src/core/ext/transport/chttp2/server/chttp2_server.cc',
        'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
+        'src/core/ext/filters/client_channel/channel_connectivity_internal.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
        'src/core/ext/filters/client_channel/client_channel_factory.cc',
        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-        'src/core/ext/filters/client_channel/connectivity_watcher.c',
+        'src/core/ext/filters/client_channel/connectivity_watcher.cc',
        'src/core/ext/filters/client_channel/connector.cc',
        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
        'src/core/ext/filters/client_channel/http_proxy.cc',
--- a/build.yaml
+++ b/build.yaml
@ -463,8 +463,10 @@ filegroups:
  - grpc_trace_headers
 - name: grpc_client_channel
  headers:
+  - src/core/ext/filters/client_channel/channel_connectivity_internal.h
  - src/core/ext/filters/client_channel/client_channel.h
  - src/core/ext/filters/client_channel/client_channel_factory.h
+  - src/core/ext/filters/client_channel/connectivity_watcher.h
  - src/core/ext/filters/client_channel/connector.h
  - src/core/ext/filters/client_channel/http_connect_handshaker.h
  - src/core/ext/filters/client_channel/http_proxy.h
@ -483,9 +485,11 @@ filegroups:
  - src/core/ext/filters/client_channel/uri_parser.h
  src:
  - src/core/ext/filters/client_channel/channel_connectivity.cc
+  - src/core/ext/filters/client_channel/channel_connectivity_internal.cc
  - src/core/ext/filters/client_channel/client_channel.cc
  - src/core/ext/filters/client_channel/client_channel_factory.cc
  - src/core/ext/filters/client_channel/client_channel_plugin.cc
+  - src/core/ext/filters/client_channel/connectivity_watcher.cc
  - src/core/ext/filters/client_channel/connector.cc
  - src/core/ext/filters/client_channel/http_connect_handshaker.cc
  - src/core/ext/filters/client_channel/http_proxy.cc
--- a/config.m4
+++ b/config.m4
@ -279,10 +279,11 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/transport/chttp2/server/chttp2_server.cc \
    src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
+    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
    src/core/ext/filters/client_channel/client_channel_factory.cc \
    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.c \
+    src/core/ext/filters/client_channel/connectivity_watcher.cc \
    src/core/ext/filters/client_channel/connector.cc \
    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
    src/core/ext/filters/client_channel/http_proxy.cc \
--- a/config.w32
+++ b/config.w32
@ -256,10 +256,11 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\transport\\chttp2\\server\\chttp2_server.cc " +
    "src\\core\\ext\\transport\\chttp2\\client\\secure\\secure_channel_create.cc " +
    "src\\core\\ext\\filters\\client_channel\\channel_connectivity.cc " +
+    "src\\core\\ext\\filters\\client_channel\\channel_connectivity_internal.cc " +
    "src\\core\\ext\\filters\\client_channel\\client_channel.cc " +
    "src\\core\\ext\\filters\\client_channel\\client_channel_factory.cc " +
    "src\\core\\ext\\filters\\client_channel\\client_channel_plugin.cc " +
-    "src\\core\\ext\\filters\\client_channel\\connectivity_watcher.c " +
+    "src\\core\\ext\\filters\\client_channel\\connectivity_watcher.cc " +
    "src\\core\\ext\\filters\\client_channel\\connector.cc " +
    "src\\core\\ext\\filters\\client_channel\\http_connect_handshaker.cc " +
    "src\\core\\ext\\filters\\client_channel\\http_proxy.cc " +
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -671,10 +671,11 @@ Pod::Spec.new do |s|
                      'src/core/ext/transport/chttp2/server/chttp2_server.cc',
                      'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
                      'src/core/ext/filters/client_channel/channel_connectivity.cc',
+                      'src/core/ext/filters/client_channel/channel_connectivity_internal.cc',
                      'src/core/ext/filters/client_channel/client_channel.cc',
                      'src/core/ext/filters/client_channel/client_channel_factory.cc',
                      'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-                      'src/core/ext/filters/client_channel/connectivity_watcher.c',
+                      'src/core/ext/filters/client_channel/connectivity_watcher.cc',
                      'src/core/ext/filters/client_channel/connector.cc',
                      'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
                      'src/core/ext/filters/client_channel/http_proxy.cc',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -606,10 +606,11 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/transport/chttp2/server/chttp2_server.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc )
  s.files += %w( src/core/ext/filters/client_channel/channel_connectivity.cc )
+  s.files += %w( src/core/ext/filters/client_channel/channel_connectivity_internal.cc )
  s.files += %w( src/core/ext/filters/client_channel/client_channel.cc )
  s.files += %w( src/core/ext/filters/client_channel/client_channel_factory.cc )
  s.files += %w( src/core/ext/filters/client_channel/client_channel_plugin.cc )
-  s.files += %w( src/core/ext/filters/client_channel/connectivity_watcher.c )
+  s.files += %w( src/core/ext/filters/client_channel/connectivity_watcher.cc )
  s.files += %w( src/core/ext/filters/client_channel/connector.cc )
  s.files += %w( src/core/ext/filters/client_channel/http_connect_handshaker.cc )
  s.files += %w( src/core/ext/filters/client_channel/http_proxy.cc )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -420,10 +420,11 @@
        'src/core/ext/transport/chttp2/server/chttp2_server.cc',
        'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
+        'src/core/ext/filters/client_channel/channel_connectivity_internal.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
        'src/core/ext/filters/client_channel/client_channel_factory.cc',
        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-        'src/core/ext/filters/client_channel/connectivity_watcher.c',
+        'src/core/ext/filters/client_channel/connectivity_watcher.cc',
        'src/core/ext/filters/client_channel/connector.cc',
        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
        'src/core/ext/filters/client_channel/http_proxy.cc',
@ -663,10 +664,11 @@
        'src/core/lib/transport/transport_op_string.cc',
        'src/core/lib/debug/trace.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
+        'src/core/ext/filters/client_channel/channel_connectivity_internal.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
        'src/core/ext/filters/client_channel/client_channel_factory.cc',
        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-        'src/core/ext/filters/client_channel/connectivity_watcher.c',
+        'src/core/ext/filters/client_channel/connectivity_watcher.cc',
        'src/core/ext/filters/client_channel/connector.cc',
        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
        'src/core/ext/filters/client_channel/http_proxy.cc',
@ -871,10 +873,11 @@
        'src/core/lib/transport/transport_op_string.cc',
        'src/core/lib/debug/trace.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
+        'src/core/ext/filters/client_channel/channel_connectivity_internal.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
        'src/core/ext/filters/client_channel/client_channel_factory.cc',
        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-        'src/core/ext/filters/client_channel/connectivity_watcher.c',
+        'src/core/ext/filters/client_channel/connectivity_watcher.cc',
        'src/core/ext/filters/client_channel/connector.cc',
        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
        'src/core/ext/filters/client_channel/http_proxy.cc',
@ -1097,10 +1100,11 @@
        'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc',
        'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
+        'src/core/ext/filters/client_channel/channel_connectivity_internal.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
        'src/core/ext/filters/client_channel/client_channel_factory.cc',
        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-        'src/core/ext/filters/client_channel/connectivity_watcher.c',
+        'src/core/ext/filters/client_channel/connectivity_watcher.cc',
        'src/core/ext/filters/client_channel/connector.cc',
        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
        'src/core/ext/filters/client_channel/http_proxy.cc',
--- a/package.xml
+++ b/package.xml
@ -618,10 +618,11 @@
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/chttp2_server.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/channel_connectivity.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/channel_connectivity_internal.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_factory.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_plugin.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/connectivity_watcher.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/connectivity_watcher.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/connector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/http_connect_handshaker.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/http_proxy.cc" role="src" />
--- a/src/core/ext/filters/client_channel/connectivity_watcher.cc
+++ b/src/core/ext/filters/client_channel/connectivity_watcher.cc
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -255,10 +255,11 @@ CORE_SOURCE_FILES = [
  'src/core/ext/transport/chttp2/server/chttp2_server.cc',
  'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
  'src/core/ext/filters/client_channel/channel_connectivity.cc',
+  'src/core/ext/filters/client_channel/channel_connectivity_internal.cc',
  'src/core/ext/filters/client_channel/client_channel.cc',
  'src/core/ext/filters/client_channel/client_channel_factory.cc',
  'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-  'src/core/ext/filters/client_channel/connectivity_watcher.c',
+  'src/core/ext/filters/client_channel/connectivity_watcher.cc',
  'src/core/ext/filters/client_channel/connector.cc',
  'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
  'src/core/ext/filters/client_channel/http_proxy.cc',
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -908,13 +908,14 @@ src/core/ext/census/tracing.cc \
 src/core/ext/census/tracing.h \
 src/core/ext/filters/client_channel/README.md \
 src/core/ext/filters/client_channel/channel_connectivity.cc \
+src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
 src/core/ext/filters/client_channel/channel_connectivity_internal.h \
 src/core/ext/filters/client_channel/client_channel.cc \
 src/core/ext/filters/client_channel/client_channel.h \
 src/core/ext/filters/client_channel/client_channel_factory.cc \
 src/core/ext/filters/client_channel/client_channel_factory.h \
 src/core/ext/filters/client_channel/client_channel_plugin.cc \
-src/core/ext/filters/client_channel/connectivity_watcher.c \
+src/core/ext/filters/client_channel/connectivity_watcher.cc \
 src/core/ext/filters/client_channel/connectivity_watcher.h \
 src/core/ext/filters/client_channel/connector.cc \
 src/core/ext/filters/client_channel/connector.h \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -8493,13 +8493,14 @@
    "name": "grpc_client_channel", 
    "src": [
      "src/core/ext/filters/client_channel/channel_connectivity.cc", 
+      "src/core/ext/filters/client_channel/channel_connectivity_internal.cc", 
      "src/core/ext/filters/client_channel/channel_connectivity_internal.h", 
      "src/core/ext/filters/client_channel/client_channel.cc", 
      "src/core/ext/filters/client_channel/client_channel.h", 
      "src/core/ext/filters/client_channel/client_channel_factory.cc", 
      "src/core/ext/filters/client_channel/client_channel_factory.h", 
      "src/core/ext/filters/client_channel/client_channel_plugin.cc", 
-      "src/core/ext/filters/client_channel/connectivity_watcher.c", 
+      "src/core/ext/filters/client_channel/connectivity_watcher.cc", 
      "src/core/ext/filters/client_channel/connectivity_watcher.h", 
      "src/core/ext/filters/client_channel/connector.cc", 
      "src/core/ext/filters/client_channel/connector.h",