Merge pull request #6016 from dgquintas/subchannel_factory_create_lb_channel

Introducing client_channel_factory
9 years ago · e65cde079b
parent 879a8f3bba d82245adec
commit e65cde079b
34 changed files with 297 additions and 205 deletions
--- a/12
+++ b/12
@ -198,6 +198,7 @@ cc_library(
    "src/core/lib/channel/http_client_filter.h",
    "src/core/lib/channel/http_server_filter.h",
    "src/core/lib/channel/subchannel_call_holder.h",
+    "src/core/lib/client_config/client_channel_factory.h",
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
@ -208,7 +209,6 @@ cc_library(
    "src/core/lib/client_config/resolver_factory.h",
    "src/core/lib/client_config/resolver_registry.h",
    "src/core/lib/client_config/subchannel.h",
-    "src/core/lib/client_config/subchannel_factory.h",
    "src/core/lib/client_config/subchannel_index.h",
    "src/core/lib/client_config/uri_parser.h",
    "src/core/lib/compression/algorithm_metadata.h",
@ -339,6 +339,7 @@ cc_library(
    "src/core/lib/channel/http_client_filter.c",
    "src/core/lib/channel/http_server_filter.c",
    "src/core/lib/channel/subchannel_call_holder.c",
+    "src/core/lib/client_config/client_channel_factory.c",
    "src/core/lib/client_config/client_config.c",
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
@ -350,7 +351,6 @@ cc_library(
    "src/core/lib/client_config/resolver_factory.c",
    "src/core/lib/client_config/resolver_registry.c",
    "src/core/lib/client_config/subchannel.c",
-    "src/core/lib/client_config/subchannel_factory.c",
    "src/core/lib/client_config/subchannel_index.c",
    "src/core/lib/client_config/uri_parser.c",
    "src/core/lib/compression/compression_algorithm.c",
@ -561,6 +561,7 @@ cc_library(
    "src/core/lib/channel/http_client_filter.h",
    "src/core/lib/channel/http_server_filter.h",
    "src/core/lib/channel/subchannel_call_holder.h",
+    "src/core/lib/client_config/client_channel_factory.h",
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
@ -571,7 +572,6 @@ cc_library(
    "src/core/lib/client_config/resolver_factory.h",
    "src/core/lib/client_config/resolver_registry.h",
    "src/core/lib/client_config/subchannel.h",
-    "src/core/lib/client_config/subchannel_factory.h",
    "src/core/lib/client_config/subchannel_index.h",
    "src/core/lib/client_config/uri_parser.h",
    "src/core/lib/compression/algorithm_metadata.h",
@ -686,6 +686,7 @@ cc_library(
    "src/core/lib/channel/http_client_filter.c",
    "src/core/lib/channel/http_server_filter.c",
    "src/core/lib/channel/subchannel_call_holder.c",
+    "src/core/lib/client_config/client_channel_factory.c",
    "src/core/lib/client_config/client_config.c",
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
@ -697,7 +698,6 @@ cc_library(
    "src/core/lib/client_config/resolver_factory.c",
    "src/core/lib/client_config/resolver_registry.c",
    "src/core/lib/client_config/subchannel.c",
-    "src/core/lib/client_config/subchannel_factory.c",
    "src/core/lib/client_config/subchannel_index.c",
    "src/core/lib/client_config/uri_parser.c",
    "src/core/lib/compression/compression_algorithm.c",
@ -1393,6 +1393,7 @@ objc_library(
    "src/core/lib/channel/http_client_filter.c",
    "src/core/lib/channel/http_server_filter.c",
    "src/core/lib/channel/subchannel_call_holder.c",
+    "src/core/lib/client_config/client_channel_factory.c",
    "src/core/lib/client_config/client_config.c",
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
@ -1404,7 +1405,6 @@ objc_library(
    "src/core/lib/client_config/resolver_factory.c",
    "src/core/lib/client_config/resolver_registry.c",
    "src/core/lib/client_config/subchannel.c",
-    "src/core/lib/client_config/subchannel_factory.c",
    "src/core/lib/client_config/subchannel_index.c",
    "src/core/lib/client_config/uri_parser.c",
    "src/core/lib/compression/compression_algorithm.c",
@ -1557,6 +1557,7 @@ objc_library(
    "src/core/lib/channel/http_client_filter.h",
    "src/core/lib/channel/http_server_filter.h",
    "src/core/lib/channel/subchannel_call_holder.h",
+    "src/core/lib/client_config/client_channel_factory.h",
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
@ -1567,7 +1568,6 @@ objc_library(
    "src/core/lib/client_config/resolver_factory.h",
    "src/core/lib/client_config/resolver_registry.h",
    "src/core/lib/client_config/subchannel.h",
-    "src/core/lib/client_config/subchannel_factory.h",
    "src/core/lib/client_config/subchannel_index.h",
    "src/core/lib/client_config/uri_parser.h",
    "src/core/lib/compression/algorithm_metadata.h",
--- a/4
+++ b/4
@ -2487,6 +2487,7 @@ LIBGRPC_SRC = \
    src/core/lib/channel/http_client_filter.c \
    src/core/lib/channel/http_server_filter.c \
    src/core/lib/channel/subchannel_call_holder.c \
+    src/core/lib/client_config/client_channel_factory.c \
    src/core/lib/client_config/client_config.c \
    src/core/lib/client_config/connector.c \
    src/core/lib/client_config/default_initial_connect_string.c \
@ -2498,7 +2499,6 @@ LIBGRPC_SRC = \
    src/core/lib/client_config/resolver_factory.c \
    src/core/lib/client_config/resolver_registry.c \
    src/core/lib/client_config/subchannel.c \
-    src/core/lib/client_config/subchannel_factory.c \
    src/core/lib/client_config/subchannel_index.c \
    src/core/lib/client_config/uri_parser.c \
    src/core/lib/compression/compression_algorithm.c \
@ -2844,6 +2844,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/channel/http_client_filter.c \
    src/core/lib/channel/http_server_filter.c \
    src/core/lib/channel/subchannel_call_holder.c \
+    src/core/lib/client_config/client_channel_factory.c \
    src/core/lib/client_config/client_config.c \
    src/core/lib/client_config/connector.c \
    src/core/lib/client_config/default_initial_connect_string.c \
@ -2855,7 +2856,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/client_config/resolver_factory.c \
    src/core/lib/client_config/resolver_registry.c \
    src/core/lib/client_config/subchannel.c \
-    src/core/lib/client_config/subchannel_factory.c \
    src/core/lib/client_config/subchannel_index.c \
    src/core/lib/client_config/uri_parser.c \
    src/core/lib/compression/compression_algorithm.c \
--- a/binding.gyp
+++ b/binding.gyp
@ -607,6 +607,7 @@
        'src/core/lib/channel/http_client_filter.c',
        'src/core/lib/channel/http_server_filter.c',
        'src/core/lib/channel/subchannel_call_holder.c',
+        'src/core/lib/client_config/client_channel_factory.c',
        'src/core/lib/client_config/client_config.c',
        'src/core/lib/client_config/connector.c',
        'src/core/lib/client_config/default_initial_connect_string.c',
@ -618,7 +619,6 @@
        'src/core/lib/client_config/resolver_factory.c',
        'src/core/lib/client_config/resolver_registry.c',
        'src/core/lib/client_config/subchannel.c',
-        'src/core/lib/client_config/subchannel_factory.c',
        'src/core/lib/client_config/subchannel_index.c',
        'src/core/lib/client_config/uri_parser.c',
        'src/core/lib/compression/compression_algorithm.c',
--- a/build.yaml
+++ b/build.yaml
@ -264,6 +264,7 @@ filegroups:
  - src/core/lib/channel/http_client_filter.h
  - src/core/lib/channel/http_server_filter.h
  - src/core/lib/channel/subchannel_call_holder.h
+  - src/core/lib/client_config/client_channel_factory.h
  - src/core/lib/client_config/client_config.h
  - src/core/lib/client_config/connector.h
  - src/core/lib/client_config/initial_connect_string.h
@ -274,7 +275,6 @@ filegroups:
  - src/core/lib/client_config/resolver_factory.h
  - src/core/lib/client_config/resolver_registry.h
  - src/core/lib/client_config/subchannel.h
-  - src/core/lib/client_config/subchannel_factory.h
  - src/core/lib/client_config/subchannel_index.h
  - src/core/lib/client_config/uri_parser.h
  - src/core/lib/compression/algorithm_metadata.h
@ -352,6 +352,7 @@ filegroups:
  - src/core/lib/channel/http_client_filter.c
  - src/core/lib/channel/http_server_filter.c
  - src/core/lib/channel/subchannel_call_holder.c
+  - src/core/lib/client_config/client_channel_factory.c
  - src/core/lib/client_config/client_config.c
  - src/core/lib/client_config/connector.c
  - src/core/lib/client_config/default_initial_connect_string.c
@ -363,7 +364,6 @@ filegroups:
  - src/core/lib/client_config/resolver_factory.c
  - src/core/lib/client_config/resolver_registry.c
  - src/core/lib/client_config/subchannel.c
-  - src/core/lib/client_config/subchannel_factory.c
  - src/core/lib/client_config/subchannel_index.c
  - src/core/lib/client_config/uri_parser.c
  - src/core/lib/compression/compression_algorithm.c
--- a/config.m4
+++ b/config.m4
@ -129,6 +129,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/channel/http_client_filter.c \
    src/core/lib/channel/http_server_filter.c \
    src/core/lib/channel/subchannel_call_holder.c \
+    src/core/lib/client_config/client_channel_factory.c \
    src/core/lib/client_config/client_config.c \
    src/core/lib/client_config/connector.c \
    src/core/lib/client_config/default_initial_connect_string.c \
@ -140,7 +141,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/client_config/resolver_factory.c \
    src/core/lib/client_config/resolver_registry.c \
    src/core/lib/client_config/subchannel.c \
-    src/core/lib/client_config/subchannel_factory.c \
    src/core/lib/client_config/subchannel_index.c \
    src/core/lib/client_config/uri_parser.c \
    src/core/lib/compression/compression_algorithm.c \
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -200,6 +200,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/channel/http_client_filter.h',
                      'src/core/lib/channel/http_server_filter.h',
                      'src/core/lib/channel/subchannel_call_holder.h',
+                      'src/core/lib/client_config/client_channel_factory.h',
                      'src/core/lib/client_config/client_config.h',
                      'src/core/lib/client_config/connector.h',
                      'src/core/lib/client_config/initial_connect_string.h',
@ -210,7 +211,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/client_config/resolver_factory.h',
                      'src/core/lib/client_config/resolver_registry.h',
                      'src/core/lib/client_config/subchannel.h',
-                      'src/core/lib/client_config/subchannel_factory.h',
                      'src/core/lib/client_config/subchannel_index.h',
                      'src/core/lib/client_config/uri_parser.h',
                      'src/core/lib/compression/algorithm_metadata.h',
@ -358,6 +358,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/channel/http_client_filter.c',
                      'src/core/lib/channel/http_server_filter.c',
                      'src/core/lib/channel/subchannel_call_holder.c',
+                      'src/core/lib/client_config/client_channel_factory.c',
                      'src/core/lib/client_config/client_config.c',
                      'src/core/lib/client_config/connector.c',
                      'src/core/lib/client_config/default_initial_connect_string.c',
@ -369,7 +370,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/client_config/resolver_factory.c',
                      'src/core/lib/client_config/resolver_registry.c',
                      'src/core/lib/client_config/subchannel.c',
-                      'src/core/lib/client_config/subchannel_factory.c',
                      'src/core/lib/client_config/subchannel_index.c',
                      'src/core/lib/client_config/uri_parser.c',
                      'src/core/lib/compression/compression_algorithm.c',
@ -523,6 +523,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/channel/http_client_filter.h',
                              'src/core/lib/channel/http_server_filter.h',
                              'src/core/lib/channel/subchannel_call_holder.h',
+                              'src/core/lib/client_config/client_channel_factory.h',
                              'src/core/lib/client_config/client_config.h',
                              'src/core/lib/client_config/connector.h',
                              'src/core/lib/client_config/initial_connect_string.h',
@ -533,7 +534,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/client_config/resolver_factory.h',
                              'src/core/lib/client_config/resolver_registry.h',
                              'src/core/lib/client_config/subchannel.h',
-                              'src/core/lib/client_config/subchannel_factory.h',
                              'src/core/lib/client_config/subchannel_index.h',
                              'src/core/lib/client_config/uri_parser.h',
                              'src/core/lib/compression/algorithm_metadata.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -196,6 +196,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/channel/http_client_filter.h )
  s.files += %w( src/core/lib/channel/http_server_filter.h )
  s.files += %w( src/core/lib/channel/subchannel_call_holder.h )
+  s.files += %w( src/core/lib/client_config/client_channel_factory.h )
  s.files += %w( src/core/lib/client_config/client_config.h )
  s.files += %w( src/core/lib/client_config/connector.h )
  s.files += %w( src/core/lib/client_config/initial_connect_string.h )
@ -206,7 +207,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/resolver_factory.h )
  s.files += %w( src/core/lib/client_config/resolver_registry.h )
  s.files += %w( src/core/lib/client_config/subchannel.h )
-  s.files += %w( src/core/lib/client_config/subchannel_factory.h )
  s.files += %w( src/core/lib/client_config/subchannel_index.h )
  s.files += %w( src/core/lib/client_config/uri_parser.h )
  s.files += %w( src/core/lib/compression/algorithm_metadata.h )
@ -341,6 +341,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/channel/http_client_filter.c )
  s.files += %w( src/core/lib/channel/http_server_filter.c )
  s.files += %w( src/core/lib/channel/subchannel_call_holder.c )
+  s.files += %w( src/core/lib/client_config/client_channel_factory.c )
  s.files += %w( src/core/lib/client_config/client_config.c )
  s.files += %w( src/core/lib/client_config/connector.c )
  s.files += %w( src/core/lib/client_config/default_initial_connect_string.c )
@ -352,7 +353,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/resolver_factory.c )
  s.files += %w( src/core/lib/client_config/resolver_registry.c )
  s.files += %w( src/core/lib/client_config/subchannel.c )
-  s.files += %w( src/core/lib/client_config/subchannel_factory.c )
  s.files += %w( src/core/lib/client_config/subchannel_index.c )
  s.files += %w( src/core/lib/client_config/uri_parser.c )
  s.files += %w( src/core/lib/compression/compression_algorithm.c )
--- a/package.json
+++ b/package.json
@ -139,6 +139,7 @@
    "src/core/lib/channel/http_client_filter.h",
    "src/core/lib/channel/http_server_filter.h",
    "src/core/lib/channel/subchannel_call_holder.h",
+    "src/core/lib/client_config/client_channel_factory.h",
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
@ -149,7 +150,6 @@
    "src/core/lib/client_config/resolver_factory.h",
    "src/core/lib/client_config/resolver_registry.h",
    "src/core/lib/client_config/subchannel.h",
-    "src/core/lib/client_config/subchannel_factory.h",
    "src/core/lib/client_config/subchannel_index.h",
    "src/core/lib/client_config/uri_parser.h",
    "src/core/lib/compression/algorithm_metadata.h",
@ -284,6 +284,7 @@
    "src/core/lib/channel/http_client_filter.c",
    "src/core/lib/channel/http_server_filter.c",
    "src/core/lib/channel/subchannel_call_holder.c",
+    "src/core/lib/client_config/client_channel_factory.c",
    "src/core/lib/client_config/client_config.c",
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
@ -295,7 +296,6 @@
    "src/core/lib/client_config/resolver_factory.c",
    "src/core/lib/client_config/resolver_registry.c",
    "src/core/lib/client_config/subchannel.c",
-    "src/core/lib/client_config/subchannel_factory.c",
    "src/core/lib/client_config/subchannel_index.c",
    "src/core/lib/client_config/uri_parser.c",
    "src/core/lib/compression/compression_algorithm.c",
--- a/package.xml
+++ b/package.xml
@ -200,6 +200,7 @@
    <file baseinstalldir="/" name="src/core/lib/channel/http_client_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/http_server_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/subchannel_call_holder.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/client_config/client_channel_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/client_config.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/connector.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/initial_connect_string.h" role="src" />
@ -210,7 +211,6 @@
    <file baseinstalldir="/" name="src/core/lib/client_config/resolver_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/resolver_registry.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/subchannel.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_index.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/uri_parser.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/algorithm_metadata.h" role="src" />
@ -345,6 +345,7 @@
    <file baseinstalldir="/" name="src/core/lib/channel/http_client_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/http_server_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/subchannel_call_holder.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/client_config/client_channel_factory.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/client_config.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/connector.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/default_initial_connect_string.c" role="src" />
@ -356,7 +357,6 @@
    <file baseinstalldir="/" name="src/core/lib/client_config/resolver_factory.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/resolver_registry.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/subchannel.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_factory.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_index.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/uri_parser.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/compression_algorithm.c" role="src" />
--- a/src/core/ext/lb_policy/pick_first/pick_first.c
+++ b/src/core/ext/lb_policy/pick_first/pick_first.c
@ -395,7 +395,7 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
                                         grpc_lb_policy_factory *factory,
                                         grpc_lb_policy_args *args) {
  GPR_ASSERT(args->addresses != NULL);
-  GPR_ASSERT(args->subchannel_factory != NULL);
+  GPR_ASSERT(args->client_channel_factory != NULL);

  if (args->addresses->naddrs == 0) return NULL;

@ -412,8 +412,8 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
    sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr);
    sc_args.addr_len = (size_t)args->addresses->addrs[i].len;

-    grpc_subchannel *subchannel = grpc_subchannel_factory_create_subchannel(
-        exec_ctx, args->subchannel_factory, &sc_args);
+    grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
+        exec_ctx, args->client_channel_factory, &sc_args);

    if (subchannel != NULL) {
      p->subchannels[subchannel_idx++] = subchannel;
--- a/src/core/ext/lb_policy/round_robin/round_robin.c
+++ b/src/core/ext/lb_policy/round_robin/round_robin.c
@ -502,7 +502,7 @@ static grpc_lb_policy *create_round_robin(grpc_exec_ctx *exec_ctx,
                                          grpc_lb_policy_factory *factory,
                                          grpc_lb_policy_args *args) {
  GPR_ASSERT(args->addresses != NULL);
-  GPR_ASSERT(args->subchannel_factory != NULL);
+  GPR_ASSERT(args->client_channel_factory != NULL);

  round_robin_lb_policy *p = gpr_malloc(sizeof(*p));
  memset(p, 0, sizeof(*p));
@ -518,8 +518,8 @@ static grpc_lb_policy *create_round_robin(grpc_exec_ctx *exec_ctx,
    sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr);
    sc_args.addr_len = (size_t)args->addresses->addrs[i].len;

-    grpc_subchannel *subchannel = grpc_subchannel_factory_create_subchannel(
-        exec_ctx, args->subchannel_factory, &sc_args);
+    grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
+        exec_ctx, args->client_channel_factory, &sc_args);

    if (subchannel != NULL) {
      subchannel_data *sd = gpr_malloc(sizeof(*sd));
--- a/src/core/ext/resolver/dns/native/dns_resolver.c
+++ b/src/core/ext/resolver/dns/native/dns_resolver.c
@ -59,7 +59,7 @@ typedef struct {
  /** default port to use */
  char *default_port;
  /** subchannel factory */
-  grpc_subchannel_factory *subchannel_factory;
+  grpc_client_channel_factory *client_channel_factory;
  /** load balancing policy name */
  char *lb_policy_name;

@ -170,7 +170,7 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg,
    config = grpc_client_config_create();
    memset(&lb_policy_args, 0, sizeof(lb_policy_args));
    lb_policy_args.addresses = addresses;
-    lb_policy_args.subchannel_factory = r->subchannel_factory;
+    lb_policy_args.client_channel_factory = r->client_channel_factory;
    lb_policy =
        grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);
    if (lb_policy != NULL) {
@ -228,7 +228,7 @@ static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
  if (r->resolved_config) {
    grpc_client_config_unref(exec_ctx, r->resolved_config);
  }
-  grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory);
+  grpc_client_channel_factory_unref(exec_ctx, r->client_channel_factory);
  gpr_free(r->name);
  gpr_free(r->default_port);
  gpr_free(r->lb_policy_name);
@ -255,10 +255,10 @@ static grpc_resolver *dns_create(grpc_resolver_args *args,
  grpc_resolver_init(&r->base, &dns_resolver_vtable);
  r->name = gpr_strdup(path);
  r->default_port = gpr_strdup(default_port);
-  r->subchannel_factory = args->subchannel_factory;
+  r->client_channel_factory = args->client_channel_factory;
  gpr_backoff_init(&r->backoff_state, BACKOFF_MULTIPLIER, BACKOFF_JITTER,
                   BACKOFF_MIN_SECONDS * 1000, BACKOFF_MAX_SECONDS * 1000);
-  grpc_subchannel_factory_ref(r->subchannel_factory);
+  grpc_client_channel_factory_ref(r->client_channel_factory);
  r->lb_policy_name = gpr_strdup(lb_policy_name);
  return &r->base;
 }
--- a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
+++ b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
@ -52,7 +52,7 @@ typedef struct {
  /** refcount */
  gpr_refcount refs;
  /** subchannel factory */
-  grpc_subchannel_factory *subchannel_factory;
+  grpc_client_channel_factory *client_channel_factory;
  /** load balancing policy name */
  char *lb_policy_name;

@ -125,7 +125,7 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
    grpc_lb_policy_args lb_policy_args;
    memset(&lb_policy_args, 0, sizeof(lb_policy_args));
    lb_policy_args.addresses = r->addresses;
-    lb_policy_args.subchannel_factory = r->subchannel_factory;
+    lb_policy_args.client_channel_factory = r->client_channel_factory;
    grpc_lb_policy *lb_policy =
        grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);
    grpc_client_config_set_lb_policy(cfg, lb_policy);
@ -140,7 +140,7 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
 static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
  sockaddr_resolver *r = (sockaddr_resolver *)gr;
  gpr_mu_destroy(&r->mu);
-  grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory);
+  grpc_client_channel_factory_unref(exec_ctx, r->client_channel_factory);
  grpc_resolved_addresses_destroy(r->addresses);
  gpr_free(r->lb_policy_name);
  gpr_free(r);
@ -318,8 +318,8 @@ static grpc_resolver *sockaddr_create(
  gpr_ref_init(&r->refs, 1);
  gpr_mu_init(&r->mu);
  grpc_resolver_init(&r->base, &sockaddr_resolver_vtable);
-  r->subchannel_factory = args->subchannel_factory;
-  grpc_subchannel_factory_ref(r->subchannel_factory);
+  r->client_channel_factory = args->client_channel_factory;
+  grpc_client_channel_factory_ref(r->client_channel_factory);

  return &r->base;
 }
--- a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c
+++ b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c
@ -57,7 +57,7 @@ typedef struct {
  /** name to resolve */
  char *name;
  /** subchannel factory */
-  grpc_subchannel_factory *subchannel_factory;
+  grpc_client_channel_factory *client_channel_factory;
  /** load balancing policy name */
  char *lb_policy_name;

@ -187,9 +187,8 @@ static void zookeeper_on_resolved(grpc_exec_ctx *exec_ctx, void *arg,
  if (addresses != NULL) {
    grpc_lb_policy_args lb_policy_args;
    config = grpc_client_config_create();
-
    lb_policy_args.addresses = addresses;
-    lb_policy_args.subchannel_factory = r->subchannel_factory;
+    lb_policy_args.client_channel_factory = r->client_channel_factory;
    lb_policy =
        grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);

@ -424,7 +423,7 @@ static void zookeeper_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
  if (r->resolved_config != NULL) {
    grpc_client_config_unref(exec_ctx, r->resolved_config);
  }
-  grpc_subchannel_factory_unref(exec_ctx, r->subchannel_factory);
+  grpc_client_channel_factory_unref(exec_ctx, r->client_channel_factory);
  gpr_free(r->name);
  gpr_free(r->lb_policy_name);
  gpr_free(r);
@ -454,8 +453,8 @@ static grpc_resolver *zookeeper_create(grpc_resolver_args *args,
  grpc_resolver_init(&r->base, &zookeeper_resolver_vtable);
  r->name = gpr_strdup(path);

-  r->subchannel_factory = args->subchannel_factory;
-  grpc_subchannel_factory_ref(r->subchannel_factory);
+  r->client_channel_factory = args->client_channel_factory;
+  grpc_client_channel_factory_ref(r->client_channel_factory);

  r->lb_policy_name = gpr_strdup(lb_policy_name);

--- a/src/core/ext/transport/chttp2/client/insecure/channel_create.c
+++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.c
@ -136,31 +136,35 @@ static const grpc_connector_vtable connector_vtable = {
    connector_ref, connector_unref, connector_shutdown, connector_connect};

 typedef struct {
-  grpc_subchannel_factory base;
+  grpc_client_channel_factory base;
  gpr_refcount refs;
  grpc_channel_args *merge_args;
  grpc_channel *master;
-} subchannel_factory;
+} client_channel_factory;

-static void subchannel_factory_ref(grpc_subchannel_factory *scf) {
-  subchannel_factory *f = (subchannel_factory *)scf;
+static void client_channel_factory_ref(
+    grpc_client_channel_factory *cc_factory) {
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
  gpr_ref(&f->refs);
 }

-static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx,
-                                     grpc_subchannel_factory *scf) {
-  subchannel_factory *f = (subchannel_factory *)scf;
+static void client_channel_factory_unref(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
  if (gpr_unref(&f->refs)) {
-    GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master, "subchannel_factory");
+    if (f->master != NULL) {
+      GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master,
+                                  "client_channel_factory");
+    }
    grpc_channel_args_destroy(f->merge_args);
    gpr_free(f);
  }
 }

-static grpc_subchannel *subchannel_factory_create_subchannel(
-    grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *scf,
+static grpc_subchannel *client_channel_factory_create_subchannel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
    grpc_subchannel_args *args) {
-  subchannel_factory *f = (subchannel_factory *)scf;
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
  connector *c = gpr_malloc(sizeof(*c));
  grpc_channel_args *final_args =
      grpc_channel_args_merge(args->args, f->merge_args);
@ -175,9 +179,33 @@ static grpc_subchannel *subchannel_factory_create_subchannel(
  return s;
 }

-static const grpc_subchannel_factory_vtable subchannel_factory_vtable = {
-    subchannel_factory_ref, subchannel_factory_unref,
-    subchannel_factory_create_subchannel};
+static grpc_channel *client_channel_factory_create_channel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
+    const char *target, grpc_client_channel_type type,
+    grpc_channel_args *args) {
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
+  grpc_channel_args *final_args = grpc_channel_args_merge(args, f->merge_args);
+  grpc_channel *channel = grpc_channel_create(exec_ctx, target, final_args,
+                                              GRPC_CLIENT_CHANNEL, NULL);
+  grpc_channel_args_destroy(final_args);
+  grpc_resolver *resolver = grpc_resolver_create(target, &f->base);
+  if (!resolver) {
+    GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel,
+                                "client_channel_factory_create_channel");
+    return NULL;
+  }
+
+  grpc_client_channel_set_resolver(
+      exec_ctx, grpc_channel_get_channel_stack(channel), resolver);
+  GRPC_RESOLVER_UNREF(exec_ctx, resolver, "create_channel");
+
+  return channel;
+}
+
+static const grpc_client_channel_factory_vtable client_channel_factory_vtable =
+    {client_channel_factory_ref, client_channel_factory_unref,
+     client_channel_factory_create_subchannel,
+     client_channel_factory_create_channel};

 /* Create a client channel:
   Asynchronously: - resolve target
@ -186,38 +214,27 @@ static const grpc_subchannel_factory_vtable subchannel_factory_vtable = {
 grpc_channel *grpc_insecure_channel_create(const char *target,
                                           const grpc_channel_args *args,
                                           void *reserved) {
-  grpc_channel *channel = NULL;
-  grpc_resolver *resolver;
-  subchannel_factory *f;
  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
  GRPC_API_TRACE(
      "grpc_insecure_channel_create(target=%p, args=%p, reserved=%p)", 3,
      (target, args, reserved));
  GPR_ASSERT(!reserved);

-  channel =
-      grpc_channel_create(&exec_ctx, target, args, GRPC_CLIENT_CHANNEL, NULL);
-
-  f = gpr_malloc(sizeof(*f));
-  f->base.vtable = &subchannel_factory_vtable;
+  client_channel_factory *f = gpr_malloc(sizeof(*f));
+  memset(f, 0, sizeof(*f));
+  f->base.vtable = &client_channel_factory_vtable;
  gpr_ref_init(&f->refs, 1);
  f->merge_args = grpc_channel_args_copy(args);
-  f->master = channel;
-  GRPC_CHANNEL_INTERNAL_REF(f->master, "subchannel_factory");
-  resolver = grpc_resolver_create(target, &f->base);
-  if (!resolver) {
-    GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, f->master, "subchannel_factory");
-    grpc_subchannel_factory_unref(&exec_ctx, &f->base);
-    grpc_exec_ctx_finish(&exec_ctx);
-    return NULL;
-  }

-  grpc_client_channel_set_resolver(
-      &exec_ctx, grpc_channel_get_channel_stack(channel), resolver);
-  GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create");
-  grpc_subchannel_factory_unref(&exec_ctx, &f->base);
+  grpc_channel *channel = client_channel_factory_create_channel(
+      &exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
+  if (channel != NULL) {
+    f->master = channel;
+    GRPC_CHANNEL_INTERNAL_REF(f->master, "grpc_insecure_channel_create");
+  }
+  grpc_client_channel_factory_unref(&exec_ctx, &f->base);

  grpc_exec_ctx_finish(&exec_ctx);

-  return channel;
+  return channel; /* may be NULL */
 }
--- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
+++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
@ -192,34 +192,38 @@ static const grpc_connector_vtable connector_vtable = {
    connector_ref, connector_unref, connector_shutdown, connector_connect};

 typedef struct {
-  grpc_subchannel_factory base;
+  grpc_client_channel_factory base;
  gpr_refcount refs;
  grpc_channel_args *merge_args;
  grpc_channel_security_connector *security_connector;
  grpc_channel *master;
-} subchannel_factory;
+} client_channel_factory;

-static void subchannel_factory_ref(grpc_subchannel_factory *scf) {
-  subchannel_factory *f = (subchannel_factory *)scf;
+static void client_channel_factory_ref(
+    grpc_client_channel_factory *cc_factory) {
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
  gpr_ref(&f->refs);
 }

-static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx,
-                                     grpc_subchannel_factory *scf) {
-  subchannel_factory *f = (subchannel_factory *)scf;
+static void client_channel_factory_unref(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
  if (gpr_unref(&f->refs)) {
    GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
-                                  "subchannel_factory");
-    GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master, "subchannel_factory");
+                                  "client_channel_factory");
+    if (f->master != NULL) {
+      GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, f->master,
+                                  "client_channel_factory");
+    }
    grpc_channel_args_destroy(f->merge_args);
    gpr_free(f);
  }
 }

-static grpc_subchannel *subchannel_factory_create_subchannel(
-    grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *scf,
+static grpc_subchannel *client_channel_factory_create_subchannel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
    grpc_subchannel_args *args) {
-  subchannel_factory *f = (subchannel_factory *)scf;
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
  connector *c = gpr_malloc(sizeof(*c));
  grpc_channel_args *final_args =
      grpc_channel_args_merge(args->args, f->merge_args);
@ -236,9 +240,37 @@ static grpc_subchannel *subchannel_factory_create_subchannel(
  return s;
 }

-static const grpc_subchannel_factory_vtable subchannel_factory_vtable = {
-    subchannel_factory_ref, subchannel_factory_unref,
-    subchannel_factory_create_subchannel};
+static grpc_channel *client_channel_factory_create_channel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
+    const char *target, grpc_client_channel_type type,
+    grpc_channel_args *args) {
+  client_channel_factory *f = (client_channel_factory *)cc_factory;
+
+  grpc_channel_args *final_args = grpc_channel_args_merge(args, f->merge_args);
+  grpc_channel *channel = grpc_channel_create(exec_ctx, target, final_args,
+                                              GRPC_CLIENT_CHANNEL, NULL);
+  grpc_channel_args_destroy(final_args);
+
+  grpc_resolver *resolver = grpc_resolver_create(target, &f->base);
+  if (resolver != NULL) {
+    grpc_client_channel_set_resolver(
+        exec_ctx, grpc_channel_get_channel_stack(channel), resolver);
+    GRPC_RESOLVER_UNREF(exec_ctx, resolver, "create");
+  } else {
+    GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel,
+                                "client_channel_factory_create_channel");
+    channel = NULL;
+  }
+
+  GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
+                                "client_channel_factory_create_channel");
+  return channel;
+}
+
+static const grpc_client_channel_factory_vtable client_channel_factory_vtable =
+    {client_channel_factory_ref, client_channel_factory_unref,
+     client_channel_factory_create_subchannel,
+     client_channel_factory_create_channel};

 /* Create a secure client channel:
   Asynchronously: - resolve target
@ -248,13 +280,11 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
                                         const char *target,
                                         const grpc_channel_args *args,
                                         void *reserved) {
-  grpc_channel *channel;
  grpc_arg connector_arg;
  grpc_channel_args *args_copy;
  grpc_channel_args *new_args_from_connector;
  grpc_channel_security_connector *security_connector;
-  grpc_resolver *resolver;
-  subchannel_factory *f;
+  client_channel_factory *f;
  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;

  GRPC_API_TRACE(
@ -284,35 +314,30 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
      new_args_from_connector != NULL ? new_args_from_connector : args,
      &connector_arg, 1);

-  channel = grpc_channel_create(&exec_ctx, target, args_copy,
-                                GRPC_CLIENT_CHANNEL, NULL);
-
  f = gpr_malloc(sizeof(*f));
-  f->base.vtable = &subchannel_factory_vtable;
+  memset(f, 0, sizeof(*f));
+  f->base.vtable = &client_channel_factory_vtable;
  gpr_ref_init(&f->refs, 1);
-  GRPC_SECURITY_CONNECTOR_REF(&security_connector->base, "subchannel_factory");
-  f->security_connector = security_connector;
+
  f->merge_args = grpc_channel_args_copy(args_copy);
-  f->master = channel;
-  GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory");
-  resolver = grpc_resolver_create(target, &f->base);
-  if (resolver) {
-    grpc_client_channel_set_resolver(
-        &exec_ctx, grpc_channel_get_channel_stack(channel), resolver);
-    GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create");
-  }
-  grpc_subchannel_factory_unref(&exec_ctx, &f->base);
-  GRPC_SECURITY_CONNECTOR_UNREF(&security_connector->base, "channel_create");
  grpc_channel_args_destroy(args_copy);
  if (new_args_from_connector != NULL) {
    grpc_channel_args_destroy(new_args_from_connector);
  }

-  if (!resolver) {
-    GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, channel, "subchannel_factory");
-    channel = NULL;
+  GRPC_SECURITY_CONNECTOR_REF(&security_connector->base,
+                              "grpc_secure_channel_create");
+  f->security_connector = security_connector;
+
+  grpc_channel *channel = client_channel_factory_create_channel(
+      &exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
+  if (channel != NULL) {
+    f->master = channel;
+    GRPC_CHANNEL_INTERNAL_REF(f->master, "grpc_secure_channel_create");
  }
+
+  grpc_client_channel_factory_unref(&exec_ctx, &f->base);
  grpc_exec_ctx_finish(&exec_ctx);

-  return channel;
+  return channel; /* may be NULL */
 }
--- a/src/core/lib/client_config/README.md
+++ b/src/core/lib/client_config/README.md
@ -40,7 +40,7 @@ decisions (for example, by avoiding disconnected backends).
 Configured sub-channels are fully setup to participate in the grpc data plane.
 Their behavior is specified by a set of grpc channel filters defined at their
 construction. To customize this behavior, resolvers build
-grpc_subchannel_factory objects, which use the decorator pattern to customize
+grpc_client_channel_factory objects, which use the decorator pattern to customize
 construction arguments for concrete grpc_subchannel instances.


--- a/src/core/lib/client_config/client_channel_factory.c
+++ b/src/core/lib/client_config/client_channel_factory.c
@ -31,19 +31,27 @@
 *
 */

-#include "src/core/lib/client_config/subchannel_factory.h"
+#include "src/core/lib/client_config/client_channel_factory.h"

-void grpc_subchannel_factory_ref(grpc_subchannel_factory* factory) {
+void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory) {
  factory->vtable->ref(factory);
 }

-void grpc_subchannel_factory_unref(grpc_exec_ctx* exec_ctx,
-                                   grpc_subchannel_factory* factory) {
+void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx,
+                                       grpc_client_channel_factory* factory) {
  factory->vtable->unref(exec_ctx, factory);
 }

-grpc_subchannel* grpc_subchannel_factory_create_subchannel(
-    grpc_exec_ctx* exec_ctx, grpc_subchannel_factory* factory,
+grpc_subchannel* grpc_client_channel_factory_create_subchannel(
+    grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory,
    grpc_subchannel_args* args) {
  return factory->vtable->create_subchannel(exec_ctx, factory, args);
 }
+
+grpc_channel* grpc_client_channel_factory_create_channel(
+    grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory,
+    const char* target, grpc_client_channel_type type,
+    grpc_channel_args* args) {
+  return factory->vtable->create_client_channel(exec_ctx, factory, target, type,
+                                                args);
+}
--- a/src/core/lib/client_config/client_channel_factory.h
+++ b/src/core/lib/client_config/client_channel_factory.h
@ -31,36 +31,55 @@
 *
 */

-#ifndef GRPC_CORE_LIB_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H
-#define GRPC_CORE_LIB_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H
+#ifndef GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H
+#define GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H
+
+#include <grpc/impl/codegen/grpc_types.h>

 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/client_config/subchannel.h"

-typedef struct grpc_subchannel_factory grpc_subchannel_factory;
-typedef struct grpc_subchannel_factory_vtable grpc_subchannel_factory_vtable;
+typedef struct grpc_client_channel_factory grpc_client_channel_factory;
+typedef struct grpc_client_channel_factory_vtable
+    grpc_client_channel_factory_vtable;
+
+typedef enum {
+  GRPC_CLIENT_CHANNEL_TYPE_REGULAR, /** for the user-level regular calls */
+  GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, /** for communication with a load
+                                              balancing service */
+} grpc_client_channel_type;

 /** Constructor for new configured channels.
    Creating decorators around this type is encouraged to adapt behavior. */
-struct grpc_subchannel_factory {
-  const grpc_subchannel_factory_vtable *vtable;
+struct grpc_client_channel_factory {
+  const grpc_client_channel_factory_vtable *vtable;
 };

-struct grpc_subchannel_factory_vtable {
-  void (*ref)(grpc_subchannel_factory *factory);
-  void (*unref)(grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory);
+struct grpc_client_channel_factory_vtable {
+  void (*ref)(grpc_client_channel_factory *factory);
+  void (*unref)(grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory);
  grpc_subchannel *(*create_subchannel)(grpc_exec_ctx *exec_ctx,
-                                        grpc_subchannel_factory *factory,
+                                        grpc_client_channel_factory *factory,
                                        grpc_subchannel_args *args);
+  grpc_channel *(*create_client_channel)(grpc_exec_ctx *exec_ctx,
+                                         grpc_client_channel_factory *factory,
+                                         const char *target,
+                                         grpc_client_channel_type type,
+                                         grpc_channel_args *args);
 };

-void grpc_subchannel_factory_ref(grpc_subchannel_factory *factory);
-void grpc_subchannel_factory_unref(grpc_exec_ctx *exec_ctx,
-                                   grpc_subchannel_factory *factory);
+void grpc_client_channel_factory_ref(grpc_client_channel_factory *factory);
+void grpc_client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
+                                       grpc_client_channel_factory *factory);

 /** Create a new grpc_subchannel */
-grpc_subchannel *grpc_subchannel_factory_create_subchannel(
-    grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory,
+grpc_subchannel *grpc_client_channel_factory_create_subchannel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
    grpc_subchannel_args *args);

-#endif /* GRPC_CORE_LIB_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H */
+/** Create a new grpc_channel */
+grpc_channel *grpc_client_channel_factory_create_channel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
+    const char *target, grpc_client_channel_type type, grpc_channel_args *args);
+
+#endif /* GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H */
--- a/src/core/lib/client_config/lb_policy_factory.h
+++ b/src/core/lib/client_config/lb_policy_factory.h
@ -34,8 +34,8 @@
 #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_FACTORY_H
 #define GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_FACTORY_H

+#include "src/core/lib/client_config/client_channel_factory.h"
 #include "src/core/lib/client_config/lb_policy.h"
-#include "src/core/lib/client_config/subchannel_factory.h"
 #include "src/core/lib/iomgr/resolve_address.h"

 #include "src/core/lib/iomgr/exec_ctx.h"
@ -51,7 +51,7 @@ struct grpc_lb_policy_factory {

 typedef struct grpc_lb_policy_args {
  grpc_resolved_addresses *addresses;
-  grpc_subchannel_factory *subchannel_factory;
+  grpc_client_channel_factory *client_channel_factory;
 } grpc_lb_policy_args;

 struct grpc_lb_policy_factory_vtable {
--- a/src/core/lib/client_config/resolver_factory.h
+++ b/src/core/lib/client_config/resolver_factory.h
@ -34,8 +34,8 @@
 #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_FACTORY_H
 #define GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_FACTORY_H

+#include "src/core/lib/client_config/client_channel_factory.h"
 #include "src/core/lib/client_config/resolver.h"
-#include "src/core/lib/client_config/subchannel_factory.h"
 #include "src/core/lib/client_config/uri_parser.h"

 typedef struct grpc_resolver_factory grpc_resolver_factory;
@ -49,7 +49,7 @@ struct grpc_resolver_factory {

 typedef struct grpc_resolver_args {
  grpc_uri *uri;
-  grpc_subchannel_factory *subchannel_factory;
+  grpc_client_channel_factory *client_channel_factory;
 } grpc_resolver_args;

 struct grpc_resolver_factory_vtable {
--- a/src/core/lib/client_config/resolver_registry.c
+++ b/src/core/lib/client_config/resolver_registry.c
@ -123,14 +123,14 @@ static grpc_resolver_factory *resolve_factory(const char *target,
 }

 grpc_resolver *grpc_resolver_create(
-    const char *target, grpc_subchannel_factory *subchannel_factory) {
+    const char *target, grpc_client_channel_factory *client_channel_factory) {
  grpc_uri *uri = NULL;
  grpc_resolver_factory *factory = resolve_factory(target, &uri);
  grpc_resolver *resolver;
  grpc_resolver_args args;
  memset(&args, 0, sizeof(args));
  args.uri = uri;
-  args.subchannel_factory = subchannel_factory;
+  args.client_channel_factory = client_channel_factory;
  resolver = grpc_resolver_factory_create_resolver(factory, &args);
  grpc_uri_destroy(uri);
  return resolver;
--- a/src/core/lib/client_config/resolver_registry.h
+++ b/src/core/lib/client_config/resolver_registry.h
@ -56,7 +56,7 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory);
    return it.
    If a resolver factory was not found, return NULL. */
 grpc_resolver *grpc_resolver_create(
-    const char *target, grpc_subchannel_factory *subchannel_factory);
+    const char *target, grpc_client_channel_factory *client_channel_factory);

 /** Find a resolver factory given a name and return an (owned-by-the-caller)
 *  reference to it */
--- a/src/core/lib/surface/channel.h
+++ b/src/core/lib/surface/channel.h
@ -35,7 +35,7 @@
 #define GRPC_CORE_LIB_SURFACE_CHANNEL_H

 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/client_config/subchannel_factory.h"
+#include "src/core/lib/client_config/client_channel_factory.h"
 #include "src/core/lib/surface/channel_stack_type.h"

 grpc_channel *grpc_channel_create(grpc_exec_ctx *exec_ctx, const char *target,
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -123,6 +123,7 @@ CORE_SOURCE_FILES = [
  'src/core/lib/channel/http_client_filter.c',
  'src/core/lib/channel/http_server_filter.c',
  'src/core/lib/channel/subchannel_call_holder.c',
+  'src/core/lib/client_config/client_channel_factory.c',
  'src/core/lib/client_config/client_config.c',
  'src/core/lib/client_config/connector.c',
  'src/core/lib/client_config/default_initial_connect_string.c',
@ -134,7 +135,6 @@ CORE_SOURCE_FILES = [
  'src/core/lib/client_config/resolver_factory.c',
  'src/core/lib/client_config/resolver_registry.c',
  'src/core/lib/client_config/subchannel.c',
-  'src/core/lib/client_config/subchannel_factory.c',
  'src/core/lib/client_config/subchannel_index.c',
  'src/core/lib/client_config/uri_parser.c',
  'src/core/lib/compression/compression_algorithm.c',
--- a/test/core/client_config/resolvers/dns_resolver_connectivity_test.c
+++ b/test/core/client_config/resolvers/dns_resolver_connectivity_test.c
@ -41,20 +41,28 @@
 #include "src/core/lib/iomgr/timer.h"
 #include "test/core/util/test_config.h"

-static void subchannel_factory_ref(grpc_subchannel_factory *scv) {}
-static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx,
-                                     grpc_subchannel_factory *scv) {}
-static grpc_subchannel *subchannel_factory_create_subchannel(
-    grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory,
+static void client_channel_factory_ref(grpc_client_channel_factory *scv) {}
+static void client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
+                                         grpc_client_channel_factory *scv) {}
+static grpc_subchannel *client_channel_factory_create_subchannel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
    grpc_subchannel_args *args) {
  return NULL;
 }

-static const grpc_subchannel_factory_vtable sc_vtable = {
-    subchannel_factory_ref, subchannel_factory_unref,
-    subchannel_factory_create_subchannel};
+static grpc_channel *client_channel_factory_create_channel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
+    const char *target, grpc_client_channel_type type,
+    grpc_channel_args *args) {
+  GPR_UNREACHABLE_CODE(return NULL);
+}
+
+static const grpc_client_channel_factory_vtable sc_vtable = {
+    client_channel_factory_ref, client_channel_factory_unref,
+    client_channel_factory_create_subchannel,
+    client_channel_factory_create_channel};

-static grpc_subchannel_factory sc_factory = {&sc_vtable};
+static grpc_client_channel_factory cc_factory = {&sc_vtable};

 static gpr_mu g_mu;
 static bool g_fail_resolution = true;
@ -84,7 +92,7 @@ static grpc_resolver *create_resolver(const char *name) {
  grpc_resolver_args args;
  memset(&args, 0, sizeof(args));
  args.uri = uri;
-  args.subchannel_factory = &sc_factory;
+  args.client_channel_factory = &cc_factory;
  grpc_resolver *resolver =
      grpc_resolver_factory_create_resolver(factory, &args);
  grpc_resolver_factory_unref(factory);
--- a/test/core/client_config/resolvers/dns_resolver_test.c
+++ b/test/core/client_config/resolvers/dns_resolver_test.c
@ -38,20 +38,28 @@
 #include "src/core/lib/client_config/resolver_registry.h"
 #include "test/core/util/test_config.h"

-static void subchannel_factory_ref(grpc_subchannel_factory *scv) {}
-static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx,
-                                     grpc_subchannel_factory *scv) {}
-static grpc_subchannel *subchannel_factory_create_subchannel(
-    grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory,
+static void client_channel_factory_ref(grpc_client_channel_factory *scv) {}
+static void client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
+                                         grpc_client_channel_factory *scv) {}
+static grpc_subchannel *client_channel_factory_create_subchannel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
    grpc_subchannel_args *args) {
  GPR_UNREACHABLE_CODE(return NULL);
 }

-static const grpc_subchannel_factory_vtable sc_vtable = {
-    subchannel_factory_ref, subchannel_factory_unref,
-    subchannel_factory_create_subchannel};
+static grpc_channel *client_channel_factory_create_channel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
+    const char *target, grpc_client_channel_type type,
+    grpc_channel_args *args) {
+  GPR_UNREACHABLE_CODE(return NULL);
+}
+
+static const grpc_client_channel_factory_vtable sc_vtable = {
+    client_channel_factory_ref, client_channel_factory_unref,
+    client_channel_factory_create_subchannel,
+    client_channel_factory_create_channel};

-static grpc_subchannel_factory sc_factory = {&sc_vtable};
+static grpc_client_channel_factory cc_factory = {&sc_vtable};

 static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
@ -63,7 +71,7 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
  GPR_ASSERT(uri);
  memset(&args, 0, sizeof(args));
  args.uri = uri;
-  args.subchannel_factory = &sc_factory;
+  args.client_channel_factory = &cc_factory;
  resolver = grpc_resolver_factory_create_resolver(factory, &args);
  GPR_ASSERT(resolver != NULL);
  GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds");
--- a/test/core/client_config/resolvers/sockaddr_resolver_test.c
+++ b/test/core/client_config/resolvers/sockaddr_resolver_test.c
@ -38,20 +38,28 @@
 #include "src/core/lib/client_config/resolver_registry.h"
 #include "test/core/util/test_config.h"

-static void subchannel_factory_ref(grpc_subchannel_factory *scv) {}
-static void subchannel_factory_unref(grpc_exec_ctx *exec_ctx,
-                                     grpc_subchannel_factory *scv) {}
-static grpc_subchannel *subchannel_factory_create_subchannel(
-    grpc_exec_ctx *exec_ctx, grpc_subchannel_factory *factory,
+static void client_channel_factory_ref(grpc_client_channel_factory *scv) {}
+static void client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
+                                         grpc_client_channel_factory *scv) {}
+static grpc_subchannel *client_channel_factory_create_subchannel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
    grpc_subchannel_args *args) {
  GPR_UNREACHABLE_CODE(return NULL);
 }

-static const grpc_subchannel_factory_vtable sc_vtable = {
-    subchannel_factory_ref, subchannel_factory_unref,
-    subchannel_factory_create_subchannel};
+static grpc_channel *client_channel_factory_create_channel(
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
+    const char *target, grpc_client_channel_type type,
+    grpc_channel_args *args) {
+  GPR_UNREACHABLE_CODE(return NULL);
+}
+
+static const grpc_client_channel_factory_vtable sc_vtable = {
+    client_channel_factory_ref, client_channel_factory_unref,
+    client_channel_factory_create_subchannel,
+    client_channel_factory_create_channel};

-static grpc_subchannel_factory sc_factory = {&sc_vtable};
+static grpc_client_channel_factory cc_factory = {&sc_vtable};

 static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
@ -63,7 +71,7 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) {
  GPR_ASSERT(uri);
  memset(&args, 0, sizeof(args));
  args.uri = uri;
-  args.subchannel_factory = &sc_factory;
+  args.client_channel_factory = &cc_factory;
  resolver = grpc_resolver_factory_create_resolver(factory, &args);
  GPR_ASSERT(resolver != NULL);
  GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds");
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -812,6 +812,7 @@ src/core/lib/channel/context.h \
 src/core/lib/channel/http_client_filter.h \
 src/core/lib/channel/http_server_filter.h \
 src/core/lib/channel/subchannel_call_holder.h \
+src/core/lib/client_config/client_channel_factory.h \
 src/core/lib/client_config/client_config.h \
 src/core/lib/client_config/connector.h \
 src/core/lib/client_config/initial_connect_string.h \
@ -822,7 +823,6 @@ src/core/lib/client_config/resolver.h \
 src/core/lib/client_config/resolver_factory.h \
 src/core/lib/client_config/resolver_registry.h \
 src/core/lib/client_config/subchannel.h \
-src/core/lib/client_config/subchannel_factory.h \
 src/core/lib/client_config/subchannel_index.h \
 src/core/lib/client_config/uri_parser.h \
 src/core/lib/compression/algorithm_metadata.h \
@ -957,6 +957,7 @@ src/core/lib/channel/connected_channel.c \
 src/core/lib/channel/http_client_filter.c \
 src/core/lib/channel/http_server_filter.c \
 src/core/lib/channel/subchannel_call_holder.c \
+src/core/lib/client_config/client_channel_factory.c \
 src/core/lib/client_config/client_config.c \
 src/core/lib/client_config/connector.c \
 src/core/lib/client_config/default_initial_connect_string.c \
@ -968,7 +969,6 @@ src/core/lib/client_config/resolver.c \
 src/core/lib/client_config/resolver_factory.c \
 src/core/lib/client_config/resolver_registry.c \
 src/core/lib/client_config/subchannel.c \
-src/core/lib/client_config/subchannel_factory.c \
 src/core/lib/client_config/subchannel_index.c \
 src/core/lib/client_config/uri_parser.c \
 src/core/lib/compression/compression_algorithm.c \
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -4040,6 +4040,7 @@
      "src/core/lib/channel/http_client_filter.h", 
      "src/core/lib/channel/http_server_filter.h", 
      "src/core/lib/channel/subchannel_call_holder.h", 
+      "src/core/lib/client_config/client_channel_factory.h", 
      "src/core/lib/client_config/client_config.h", 
      "src/core/lib/client_config/connector.h", 
      "src/core/lib/client_config/initial_connect_string.h", 
@ -4050,7 +4051,6 @@
      "src/core/lib/client_config/resolver_factory.h", 
      "src/core/lib/client_config/resolver_registry.h", 
      "src/core/lib/client_config/subchannel.h", 
-      "src/core/lib/client_config/subchannel_factory.h", 
      "src/core/lib/client_config/subchannel_index.h", 
      "src/core/lib/client_config/uri_parser.h", 
      "src/core/lib/compression/algorithm_metadata.h", 
@ -4241,6 +4241,8 @@
      "src/core/lib/channel/http_server_filter.h", 
      "src/core/lib/channel/subchannel_call_holder.c", 
      "src/core/lib/channel/subchannel_call_holder.h", 
+      "src/core/lib/client_config/client_channel_factory.c", 
+      "src/core/lib/client_config/client_channel_factory.h", 
      "src/core/lib/client_config/client_config.c", 
      "src/core/lib/client_config/client_config.h", 
      "src/core/lib/client_config/connector.c", 
@ -4262,8 +4264,6 @@
      "src/core/lib/client_config/resolver_registry.h", 
      "src/core/lib/client_config/subchannel.c", 
      "src/core/lib/client_config/subchannel.h", 
-      "src/core/lib/client_config/subchannel_factory.c", 
-      "src/core/lib/client_config/subchannel_factory.h", 
      "src/core/lib/client_config/subchannel_index.c", 
      "src/core/lib/client_config/subchannel_index.h", 
      "src/core/lib/client_config/uri_parser.c", 
@ -4654,6 +4654,7 @@
      "src/core/lib/channel/http_client_filter.h", 
      "src/core/lib/channel/http_server_filter.h", 
      "src/core/lib/channel/subchannel_call_holder.h", 
+      "src/core/lib/client_config/client_channel_factory.h", 
      "src/core/lib/client_config/client_config.h", 
      "src/core/lib/client_config/connector.h", 
      "src/core/lib/client_config/initial_connect_string.h", 
@ -4664,7 +4665,6 @@
      "src/core/lib/client_config/resolver_factory.h", 
      "src/core/lib/client_config/resolver_registry.h", 
      "src/core/lib/client_config/subchannel.h", 
-      "src/core/lib/client_config/subchannel_factory.h", 
      "src/core/lib/client_config/subchannel_index.h", 
      "src/core/lib/client_config/uri_parser.h", 
      "src/core/lib/compression/algorithm_metadata.h", 
@ -4838,6 +4838,8 @@
      "src/core/lib/channel/http_server_filter.h", 
      "src/core/lib/channel/subchannel_call_holder.c", 
      "src/core/lib/channel/subchannel_call_holder.h", 
+      "src/core/lib/client_config/client_channel_factory.c", 
+      "src/core/lib/client_config/client_channel_factory.h", 
      "src/core/lib/client_config/client_config.c", 
      "src/core/lib/client_config/client_config.h", 
      "src/core/lib/client_config/connector.c", 
@ -4859,8 +4861,6 @@
      "src/core/lib/client_config/resolver_registry.h", 
      "src/core/lib/client_config/subchannel.c", 
      "src/core/lib/client_config/subchannel.h", 
-      "src/core/lib/client_config/subchannel_factory.c", 
-      "src/core/lib/client_config/subchannel_factory.h", 
      "src/core/lib/client_config/subchannel_index.c", 
      "src/core/lib/client_config/subchannel_index.h", 
      "src/core/lib/client_config/uri_parser.c", 
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@ -321,6 +321,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\connector.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.h" />
@ -331,7 +332,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\resolver_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\resolver_registry.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\uri_parser.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h" />
@ -517,6 +517,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\connector.c">
@ -539,8 +541,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\uri_parser.c">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@ -148,6 +148,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.c">
+      <Filter>src\core\lib\client_config</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
@ -181,9 +184,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.c">
-      <Filter>src\core\lib\client_config</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
@ -647,6 +647,9 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.h">
+      <Filter>src\core\lib\client_config</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
@ -677,9 +680,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.h">
-      <Filter>src\core\lib\client_config</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@ -311,6 +311,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\connector.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.h" />
@ -321,7 +322,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\resolver_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\resolver_registry.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\uri_parser.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h" />
@ -489,6 +489,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\connector.c">
@ -511,8 +513,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\uri_parser.c">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@ -142,6 +142,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.c">
+      <Filter>src\core\lib\client_config</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
@ -175,9 +178,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.c">
-      <Filter>src\core\lib\client_config</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
@ -584,6 +584,9 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_channel_factory.h">
+      <Filter>src\core\lib\client_config</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
@ -614,9 +617,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_factory.h">
-      <Filter>src\core\lib\client_config</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\subchannel_index.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>