rest of pr comments

7 years ago · e44efe099d
parent 861363d618
commit e44efe099d
17 changed files with 82 additions and 46 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1093,7 +1093,6 @@ add_library(grpc
  src/core/ext/transport/chttp2/client/insecure/channel_create.cc
  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/authority.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
  src/core/ext/filters/client_channel/client_channel.cc
@ -1115,6 +1114,7 @@ add_library(grpc
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_index.cc
  src/core/ext/filters/client_channel/uri_parser.cc
+  src/core/ext/transport/chttp2/client/authority.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/tsi/alts_transport_security.cc
  src/core/tsi/fake_transport_security.cc
@ -1428,7 +1428,6 @@ add_library(grpc_cronet
  src/core/ext/filters/http/http_filters_plugin.cc
  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/authority.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
  src/core/ext/filters/client_channel/client_channel.cc
@ -1450,6 +1449,7 @@ add_library(grpc_cronet
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_index.cc
  src/core/ext/filters/client_channel/uri_parser.cc
+  src/core/ext/transport/chttp2/client/authority.cc
  src/core/lib/http/httpcli_security_connector.cc
  src/core/lib/security/context/security_context.cc
  src/core/lib/security/credentials/alts/alts_credentials.cc
@ -1790,7 +1790,6 @@ add_library(grpc_test_util
  src/core/lib/transport/transport.cc
  src/core/lib/transport/transport_op_string.cc
  src/core/lib/debug/trace.cc
-  src/core/ext/filters/client_channel/authority.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
  src/core/ext/filters/client_channel/client_channel.cc
@ -1812,6 +1811,7 @@ add_library(grpc_test_util
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_index.cc
  src/core/ext/filters/client_channel/uri_parser.cc
+  src/core/ext/transport/chttp2/client/authority.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/transport/chttp2/transport/bin_decoder.cc
  src/core/ext/transport/chttp2/transport/bin_encoder.cc
@ -2093,7 +2093,6 @@ add_library(grpc_test_util_unsecure
  src/core/lib/transport/transport.cc
  src/core/lib/transport/transport_op_string.cc
  src/core/lib/debug/trace.cc
-  src/core/ext/filters/client_channel/authority.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
  src/core/ext/filters/client_channel/client_channel.cc
@ -2115,6 +2114,7 @@ add_library(grpc_test_util_unsecure
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_index.cc
  src/core/ext/filters/client_channel/uri_parser.cc
+  src/core/ext/transport/chttp2/client/authority.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/transport/chttp2/transport/bin_decoder.cc
  src/core/ext/transport/chttp2/transport/bin_encoder.cc
@ -2409,7 +2409,6 @@ add_library(grpc_unsecure
  src/core/ext/transport/chttp2/client/insecure/channel_create.cc
  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/authority.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
  src/core/ext/filters/client_channel/client_channel.cc
@ -2431,6 +2430,7 @@ add_library(grpc_unsecure
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_index.cc
  src/core/ext/filters/client_channel/uri_parser.cc
+  src/core/ext/transport/chttp2/client/authority.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/transport/inproc/inproc_plugin.cc
  src/core/ext/transport/inproc/inproc_transport.cc
@ -3199,7 +3199,6 @@ add_library(grpc++_cronet
  src/core/ext/filters/http/http_filters_plugin.cc
  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/authority.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
  src/core/ext/filters/client_channel/client_channel.cc
@ -3221,6 +3220,7 @@ add_library(grpc++_cronet
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_index.cc
  src/core/ext/filters/client_channel/uri_parser.cc
+  src/core/ext/transport/chttp2/client/authority.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc
  src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc
--- a/12
+++ b/12
@ -3419,7 +3419,6 @@ LIBGRPC_SRC = \
    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
    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/authority.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -3441,6 +3440,7 @@ LIBGRPC_SRC = \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
+    src/core/ext/transport/chttp2/client/authority.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/tsi/alts_transport_security.cc \
    src/core/tsi/fake_transport_security.cc \
@ -3756,7 +3756,6 @@ LIBGRPC_CRONET_SRC = \
    src/core/ext/filters/http/http_filters_plugin.cc \
    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/authority.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -3778,6 +3777,7 @@ LIBGRPC_CRONET_SRC = \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
+    src/core/ext/transport/chttp2/client/authority.cc \
    src/core/lib/http/httpcli_security_connector.cc \
    src/core/lib/security/context/security_context.cc \
    src/core/lib/security/credentials/alts/alts_credentials.cc \
@ -4119,7 +4119,6 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/lib/transport/transport.cc \
    src/core/lib/transport/transport_op_string.cc \
    src/core/lib/debug/trace.cc \
-    src/core/ext/filters/client_channel/authority.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -4141,6 +4140,7 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
+    src/core/ext/transport/chttp2/client/authority.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
@ -4415,7 +4415,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    src/core/lib/transport/transport.cc \
    src/core/lib/transport/transport_op_string.cc \
    src/core/lib/debug/trace.cc \
-    src/core/ext/filters/client_channel/authority.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -4437,6 +4436,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
+    src/core/ext/transport/chttp2/client/authority.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
@ -4711,7 +4711,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
    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/authority.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -4733,6 +4732,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
+    src/core/ext/transport/chttp2/client/authority.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/transport/inproc/inproc_plugin.cc \
    src/core/ext/transport/inproc/inproc_transport.cc \
@ -5500,7 +5500,6 @@ LIBGRPC++_CRONET_SRC = \
    src/core/ext/filters/http/http_filters_plugin.cc \
    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/authority.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -5522,6 +5521,7 @@ LIBGRPC++_CRONET_SRC = \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
+    src/core/ext/transport/chttp2/client/authority.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
--- a/build.yaml
+++ b/build.yaml
@ -544,7 +544,6 @@ filegroups:
  - grpc_base
 - name: grpc_client_channel
  headers:
-  - src/core/ext/filters/client_channel/authority.h
  - src/core/ext/filters/client_channel/backup_poller.h
  - src/core/ext/filters/client_channel/client_channel.h
  - src/core/ext/filters/client_channel/client_channel_factory.h
@ -565,8 +564,8 @@ filegroups:
  - src/core/ext/filters/client_channel/subchannel.h
  - src/core/ext/filters/client_channel/subchannel_index.h
  - src/core/ext/filters/client_channel/uri_parser.h
+  - src/core/ext/transport/chttp2/client/authority.h
  src:
-  - src/core/ext/filters/client_channel/authority.cc
  - src/core/ext/filters/client_channel/backup_poller.cc
  - src/core/ext/filters/client_channel/channel_connectivity.cc
  - src/core/ext/filters/client_channel/client_channel.cc
@ -588,6 +587,7 @@ filegroups:
  - src/core/ext/filters/client_channel/subchannel.cc
  - src/core/ext/filters/client_channel/subchannel_index.cc
  - src/core/ext/filters/client_channel/uri_parser.cc
+  - src/core/ext/transport/chttp2/client/authority.cc
  plugin: grpc_client_channel
  uses:
  - grpc_base
--- a/config.m4
+++ b/config.m4
@ -321,7 +321,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
    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/authority.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -343,6 +342,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
+    src/core/ext/transport/chttp2/client/authority.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/tsi/alts_transport_security.cc \
    src/core/tsi/fake_transport_security.cc \
--- a/config.w32
+++ b/config.w32
@ -298,7 +298,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\transport\\chttp2\\client\\insecure\\channel_create.cc " +
    "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\\authority.cc " +
    "src\\core\\ext\\filters\\client_channel\\backup_poller.cc " +
    "src\\core\\ext\\filters\\client_channel\\channel_connectivity.cc " +
    "src\\core\\ext\\filters\\client_channel\\client_channel.cc " +
@ -320,6 +319,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\client_channel\\subchannel.cc " +
    "src\\core\\ext\\filters\\client_channel\\subchannel_index.cc " +
    "src\\core\\ext\\filters\\client_channel\\uri_parser.cc " +
+    "src\\core\\ext\\transport\\chttp2\\client\\authority.cc " +
    "src\\core\\ext\\filters\\deadline\\deadline_filter.cc " +
    "src\\core\\tsi\\alts_transport_security.cc " +
    "src\\core\\tsi\\fake_transport_security.cc " +
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -309,7 +309,6 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security_adapter.h',
                      'src/core/tsi/transport_security_interface.h',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
-                      'src/core/ext/filters/client_channel/authority.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
                      'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -330,6 +329,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_index.h',
                      'src/core/ext/filters/client_channel/uri_parser.h',
+                      'src/core/ext/transport/chttp2/client/authority.h',
                      'src/core/ext/filters/deadline/deadline_filter.h',
                      'src/core/tsi/alts_transport_security.h',
                      'src/core/tsi/fake_transport_security.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -319,7 +319,6 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security_adapter.h',
                      'src/core/tsi/transport_security_interface.h',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
-                      'src/core/ext/filters/client_channel/authority.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
                      'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -340,6 +339,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_index.h',
                      'src/core/ext/filters/client_channel/uri_parser.h',
+                      'src/core/ext/transport/chttp2/client/authority.h',
                      'src/core/ext/filters/deadline/deadline_filter.h',
                      'src/core/tsi/alts_transport_security.h',
                      'src/core/tsi/fake_transport_security.h',
@ -739,7 +739,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
                      '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/authority.cc',
                      'src/core/ext/filters/client_channel/backup_poller.cc',
                      'src/core/ext/filters/client_channel/channel_connectivity.cc',
                      'src/core/ext/filters/client_channel/client_channel.cc',
@ -761,6 +760,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.cc',
                      'src/core/ext/filters/client_channel/subchannel_index.cc',
                      'src/core/ext/filters/client_channel/uri_parser.cc',
+                      'src/core/ext/transport/chttp2/client/authority.cc',
                      'src/core/ext/filters/deadline/deadline_filter.cc',
                      'src/core/tsi/alts_transport_security.cc',
                      'src/core/tsi/fake_transport_security.cc',
@ -899,7 +899,6 @@ Pod::Spec.new do |s|
                              'src/core/tsi/transport_security_adapter.h',
                              'src/core/tsi/transport_security_interface.h',
                              'src/core/ext/transport/chttp2/client/chttp2_connector.h',
-                              'src/core/ext/filters/client_channel/authority.h',
                              'src/core/ext/filters/client_channel/backup_poller.h',
                              'src/core/ext/filters/client_channel/client_channel.h',
                              'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -920,6 +919,7 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/client_channel/subchannel.h',
                              'src/core/ext/filters/client_channel/subchannel_index.h',
                              'src/core/ext/filters/client_channel/uri_parser.h',
+                              'src/core/ext/transport/chttp2/client/authority.h',
                              'src/core/ext/filters/deadline/deadline_filter.h',
                              'src/core/tsi/alts_transport_security.h',
                              'src/core/tsi/fake_transport_security.h',
@ -1383,7 +1383,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/http/client/http_client_filter.h',
                      'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                      'src/core/ext/filters/http/server/http_server_filter.h',
-                      'src/core/ext/filters/client_channel/authority.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
                      'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -1404,6 +1403,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_index.h',
                      'src/core/ext/filters/client_channel/uri_parser.h',
+                      'src/core/ext/transport/chttp2/client/authority.h',
                      'src/core/lib/security/context/security_context.h',
                      'src/core/lib/security/credentials/alts/alts_credentials.h',
                      'src/core/lib/security/credentials/composite/composite_credentials.h',
@ -1650,7 +1650,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/http/http_filters_plugin.cc',
                      '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/authority.cc',
                      'src/core/ext/filters/client_channel/backup_poller.cc',
                      'src/core/ext/filters/client_channel/channel_connectivity.cc',
                      'src/core/ext/filters/client_channel/client_channel.cc',
@ -1672,6 +1671,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.cc',
                      'src/core/ext/filters/client_channel/subchannel_index.cc',
                      'src/core/ext/filters/client_channel/uri_parser.cc',
+                      'src/core/ext/transport/chttp2/client/authority.cc',
                      'src/core/lib/http/httpcli_security_connector.cc',
                      'src/core/lib/security/context/security_context.cc',
                      'src/core/lib/security/credentials/alts/alts_credentials.cc',
@ -1935,7 +1935,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/http/client/http_client_filter.h',
                              'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                              'src/core/ext/filters/http/server/http_server_filter.h',
-                              'src/core/ext/filters/client_channel/authority.h',
                              'src/core/ext/filters/client_channel/backup_poller.h',
                              'src/core/ext/filters/client_channel/client_channel.h',
                              'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -1956,6 +1955,7 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/client_channel/subchannel.h',
                              'src/core/ext/filters/client_channel/subchannel_index.h',
                              'src/core/ext/filters/client_channel/uri_parser.h',
+                              'src/core/ext/transport/chttp2/client/authority.h',
                              'src/core/lib/security/context/security_context.h',
                              'src/core/lib/security/credentials/alts/alts_credentials.h',
                              'src/core/lib/security/credentials/composite/composite_credentials.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -250,7 +250,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/tsi/transport_security_adapter.h )
  s.files += %w( src/core/tsi/transport_security_interface.h )
  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.h )
-  s.files += %w( src/core/ext/filters/client_channel/authority.h )
  s.files += %w( src/core/ext/filters/client_channel/backup_poller.h )
  s.files += %w( src/core/ext/filters/client_channel/client_channel.h )
  s.files += %w( src/core/ext/filters/client_channel/client_channel_factory.h )
@ -271,6 +270,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/subchannel.h )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_index.h )
  s.files += %w( src/core/ext/filters/client_channel/uri_parser.h )
+  s.files += %w( src/core/ext/transport/chttp2/client/authority.h )
  s.files += %w( src/core/ext/filters/deadline/deadline_filter.h )
  s.files += %w( src/core/tsi/alts_transport_security.h )
  s.files += %w( src/core/tsi/fake_transport_security.h )
@ -673,7 +673,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.cc )
-  s.files += %w( src/core/ext/filters/client_channel/authority.cc )
  s.files += %w( src/core/ext/filters/client_channel/backup_poller.cc )
  s.files += %w( src/core/ext/filters/client_channel/channel_connectivity.cc )
  s.files += %w( src/core/ext/filters/client_channel/client_channel.cc )
@ -695,6 +694,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/subchannel.cc )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_index.cc )
  s.files += %w( src/core/ext/filters/client_channel/uri_parser.cc )
+  s.files += %w( src/core/ext/transport/chttp2/client/authority.cc )
  s.files += %w( src/core/ext/filters/deadline/deadline_filter.cc )
  s.files += %w( src/core/tsi/alts_transport_security.cc )
  s.files += %w( src/core/tsi/fake_transport_security.cc )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -474,7 +474,6 @@
        'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
        '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/authority.cc',
        'src/core/ext/filters/client_channel/backup_poller.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
@ -496,6 +495,7 @@
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
+        'src/core/ext/transport/chttp2/client/authority.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/tsi/alts_transport_security.cc',
        'src/core/tsi/fake_transport_security.cc',
@ -731,7 +731,6 @@
        'src/core/lib/transport/transport.cc',
        'src/core/lib/transport/transport_op_string.cc',
        'src/core/lib/debug/trace.cc',
-        'src/core/ext/filters/client_channel/authority.cc',
        'src/core/ext/filters/client_channel/backup_poller.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
@ -753,6 +752,7 @@
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
+        'src/core/ext/transport/chttp2/client/authority.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/transport/chttp2/transport/bin_decoder.cc',
        'src/core/ext/transport/chttp2/transport/bin_encoder.cc',
@ -962,7 +962,6 @@
        'src/core/lib/transport/transport.cc',
        'src/core/lib/transport/transport_op_string.cc',
        'src/core/lib/debug/trace.cc',
-        'src/core/ext/filters/client_channel/authority.cc',
        'src/core/ext/filters/client_channel/backup_poller.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
@ -984,6 +983,7 @@
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
+        'src/core/ext/transport/chttp2/client/authority.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/transport/chttp2/transport/bin_decoder.cc',
        'src/core/ext/transport/chttp2/transport/bin_encoder.cc',
@ -1205,7 +1205,6 @@
        'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
        '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/authority.cc',
        'src/core/ext/filters/client_channel/backup_poller.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
@ -1227,6 +1226,7 @@
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
+        'src/core/ext/transport/chttp2/client/authority.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/transport/inproc/inproc_plugin.cc',
        'src/core/ext/transport/inproc/inproc_transport.cc',
--- a/package.xml
+++ b/package.xml
@ -257,7 +257,6 @@
    <file baseinstalldir="/" name="src/core/tsi/transport_security_adapter.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security_interface.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/authority.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/backup_poller.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_factory.h" role="src" />
@ -278,6 +277,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_index.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/uri_parser.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/authority.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/fake_transport_security.h" role="src" />
@ -680,7 +680,6 @@
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/authority.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/backup_poller.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/client_channel.cc" role="src" />
@ -702,6 +701,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_index.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/uri_parser.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/authority.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/fake_transport_security.cc" role="src" />
--- a/src/core/ext/filters/client_channel/authority.h
+++ b/src/core/ext/filters/client_channel/authority.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_AUTHORITY_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_AUTHORITY_H
+#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H
+#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H

 #include <grpc/support/port_platform.h>

@ -30,7 +30,7 @@

 /// Returns a copy of \a args with the default authority channel arg set if it
 /// wasn't already present.
-grpc_channel_args* grpc_add_default_authority_if_not_present(
+grpc_channel_args* grpc_default_authority_add_if_not_present(
    const grpc_channel_args* args);

-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_AUTHORITY_H */
+#endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H */
--- a/src/core/ext/transport/chttp2/client/authority.cc
+++ b/src/core/ext/transport/chttp2/client/authority.cc
@ -18,9 +18,9 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/client_channel/authority.h"
+#include "src/core/ext/transport/chttp2/client/authority.h"

-grpc_channel_args* grpc_add_default_authority_if_not_present(
+grpc_channel_args* grpc_default_authority_add_if_not_present(
    const grpc_channel_args* args) {
  const bool has_default_authority =
      grpc_channel_args_find(args, GRPC_ARG_DEFAULT_AUTHORITY) != nullptr;
--- a/src/core/ext/transport/chttp2/client/authority.h
+++ b/src/core/ext/transport/chttp2/client/authority.h
@ -0,0 +1,36 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_AUTHORITY_H
+#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_AUTHORITY_H
+
+#include <grpc/support/port_platform.h>
+
+#include <grpc/grpc.h>
+
+#include "src/core/ext/filters/client_channel/client_channel.h"
+#include "src/core/ext/filters/client_channel/resolver_registry.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/gprpp/memory.h"
+
+/// Returns a copy of \a args with the default authority channel arg set if it
+/// wasn't already present.
+grpc_channel_args* grpc_default_authority_add_if_not_present(
+    const grpc_channel_args* args);
+
+#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_AUTHORITY_H */
--- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc
+++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc
@ -44,7 +44,7 @@ static grpc_subchannel* client_channel_factory_create_subchannel(
  grpc_subchannel_args* final_sc_args =
      static_cast<grpc_subchannel_args*>(gpr_malloc(sizeof(*final_sc_args)));
  memcpy(final_sc_args, args, sizeof(*args));
-  final_sc_args->args = grpc_add_default_authority_if_not_present(args->args);
+  final_sc_args->args = grpc_default_authority_add_if_not_present(args->args);
  grpc_connector* connector = grpc_chttp2_connector_create();
  grpc_subchannel* s = grpc_subchannel_create(connector, final_sc_args);
  grpc_connector_unref(connector);
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -297,7 +297,6 @@ CORE_SOURCE_FILES = [
    'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
    '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/authority.cc',
    'src/core/ext/filters/client_channel/backup_poller.cc',
    'src/core/ext/filters/client_channel/channel_connectivity.cc',
    'src/core/ext/filters/client_channel/client_channel.cc',
@ -319,6 +318,7 @@ CORE_SOURCE_FILES = [
    'src/core/ext/filters/client_channel/subchannel.cc',
    'src/core/ext/filters/client_channel/subchannel_index.cc',
    'src/core/ext/filters/client_channel/uri_parser.cc',
+    'src/core/ext/transport/chttp2/client/authority.cc',
    'src/core/ext/filters/deadline/deadline_filter.cc',
    'src/core/tsi/alts_transport_security.cc',
    'src/core/tsi/fake_transport_security.cc',
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -866,8 +866,6 @@ src/core/README.md \
 src/core/ext/README.md \
 src/core/ext/census/grpc_context.cc \
 src/core/ext/filters/client_channel/README.md \
-src/core/ext/filters/client_channel/authority.cc \
-src/core/ext/filters/client_channel/authority.h \
 src/core/ext/filters/client_channel/backup_poller.cc \
 src/core/ext/filters/client_channel/backup_poller.h \
 src/core/ext/filters/client_channel/channel_connectivity.cc \
@ -964,6 +962,8 @@ src/core/ext/transport/README.md \
 src/core/ext/transport/chttp2/README.md \
 src/core/ext/transport/chttp2/alpn/alpn.cc \
 src/core/ext/transport/chttp2/alpn/alpn.h \
+src/core/ext/transport/chttp2/client/authority.cc \
+src/core/ext/transport/chttp2/client/authority.h \
 src/core/ext/transport/chttp2/client/chttp2_connector.cc \
 src/core/ext/transport/chttp2/client/chttp2_connector.h \
 src/core/ext/transport/chttp2/client/insecure/README.md \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -9503,7 +9503,6 @@
      "grpc_deadline_filter"
    ], 
    "headers": [
-      "src/core/ext/filters/client_channel/authority.h", 
      "src/core/ext/filters/client_channel/backup_poller.h", 
      "src/core/ext/filters/client_channel/client_channel.h", 
      "src/core/ext/filters/client_channel/client_channel_factory.h", 
@ -9523,14 +9522,13 @@
      "src/core/ext/filters/client_channel/retry_throttle.h", 
      "src/core/ext/filters/client_channel/subchannel.h", 
      "src/core/ext/filters/client_channel/subchannel_index.h", 
-      "src/core/ext/filters/client_channel/uri_parser.h"
+      "src/core/ext/filters/client_channel/uri_parser.h", 
+      "src/core/ext/transport/chttp2/client/authority.h"
    ], 
    "is_filegroup": true, 
    "language": "c", 
    "name": "grpc_client_channel", 
    "src": [
-      "src/core/ext/filters/client_channel/authority.cc", 
-      "src/core/ext/filters/client_channel/authority.h", 
      "src/core/ext/filters/client_channel/backup_poller.cc", 
      "src/core/ext/filters/client_channel/backup_poller.h", 
      "src/core/ext/filters/client_channel/channel_connectivity.cc", 
@ -9571,7 +9569,9 @@
      "src/core/ext/filters/client_channel/subchannel_index.cc", 
      "src/core/ext/filters/client_channel/subchannel_index.h", 
      "src/core/ext/filters/client_channel/uri_parser.cc", 
-      "src/core/ext/filters/client_channel/uri_parser.h"
+      "src/core/ext/filters/client_channel/uri_parser.h", 
+      "src/core/ext/transport/chttp2/client/authority.cc", 
+      "src/core/ext/transport/chttp2/client/authority.h"
    ], 
    "third_party": false, 
    "type": "filegroup"