more comments

7 years ago · 49f625f232
parent e44efe099d
commit 49f625f232
17 changed files with 35 additions and 85 deletions
--- a/2
+++ b/2
@ -1485,9 +1485,11 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_transport_chttp2_client_connector",
    srcs = [
+        "src/core/ext/transport/chttp2/client/authority.cc",
        "src/core/ext/transport/chttp2/client/chttp2_connector.cc",
    ],
    hdrs = [
+        "src/core/ext/transport/chttp2/client/authority.h",
        "src/core/ext/transport/chttp2/client/chttp2_connector.h",
    ],
    language = "c++",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1092,6 +1092,7 @@ add_library(grpc
  src/core/tsi/transport_security_adapter.cc
  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/authority.cc
  src/core/ext/transport/chttp2/client/chttp2_connector.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
@ -1114,7 +1115,6 @@ 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
@ -1449,7 +1449,6 @@ 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
@ -1514,6 +1513,7 @@ add_library(grpc_cronet
  src/core/tsi/transport_security_adapter.cc
  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/authority.cc
  src/core/ext/transport/chttp2/client/chttp2_connector.cc
  src/core/tsi/alts_transport_security.cc
  src/core/tsi/fake_transport_security.cc
@ -1811,7 +1811,6 @@ 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
@ -2114,7 +2113,6 @@ 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
@ -2408,6 +2406,7 @@ add_library(grpc_unsecure
  src/core/ext/transport/chttp2/server/chttp2_server.cc
  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/authority.cc
  src/core/ext/transport/chttp2/client/chttp2_connector.cc
  src/core/ext/filters/client_channel/backup_poller.cc
  src/core/ext/filters/client_channel/channel_connectivity.cc
@ -2430,7 +2429,6 @@ 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
@ -3022,6 +3020,7 @@ add_library(grpc++_cronet
  src/cpp/codegen/codegen_init.cc
  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/authority.cc
  src/core/ext/transport/chttp2/client/chttp2_connector.cc
  src/core/ext/transport/chttp2/transport/bin_decoder.cc
  src/core/ext/transport/chttp2/transport/bin_encoder.cc
@ -3220,7 +3219,6 @@ 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/10
+++ b/10
@ -3418,6 +3418,7 @@ LIBGRPC_SRC = \
    src/core/tsi/transport_security_adapter.cc \
    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/authority.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
@ -3440,7 +3441,6 @@ 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 \
@ -3777,7 +3777,6 @@ 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 \
@ -3842,6 +3841,7 @@ LIBGRPC_CRONET_SRC = \
    src/core/tsi/transport_security_adapter.cc \
    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/authority.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/tsi/alts_transport_security.cc \
    src/core/tsi/fake_transport_security.cc \
@ -4140,7 +4140,6 @@ 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 \
@ -4436,7 +4435,6 @@ 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 \
@ -4710,6 +4708,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/transport/chttp2/server/chttp2_server.cc \
    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/authority.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
@ -4732,7 +4731,6 @@ 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 \
@ -5323,6 +5321,7 @@ LIBGRPC++_CRONET_SRC = \
    src/cpp/codegen/codegen_init.cc \
    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/authority.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
@ -5521,7 +5520,6 @@ 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
@ -564,7 +564,6 @@ 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/backup_poller.cc
  - src/core/ext/filters/client_channel/channel_connectivity.cc
@ -587,7 +586,6 @@ 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
@ -939,8 +937,10 @@ filegroups:
  - gpr
 - name: grpc_transport_chttp2_client_connector
  headers:
+  - src/core/ext/transport/chttp2/client/authority.h
  - src/core/ext/transport/chttp2/client/chttp2_connector.h
  src:
+  - src/core/ext/transport/chttp2/client/authority.cc
  - src/core/ext/transport/chttp2/client/chttp2_connector.cc
  uses:
  - grpc_transport_chttp2
--- a/config.m4
+++ b/config.m4
@ -320,6 +320,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/tsi/transport_security_adapter.cc \
    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/authority.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
@ -342,7 +343,6 @@ 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
@ -297,6 +297,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\tsi\\transport_security_adapter.cc " +
    "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\\authority.cc " +
    "src\\core\\ext\\transport\\chttp2\\client\\chttp2_connector.cc " +
    "src\\core\\ext\\filters\\client_channel\\backup_poller.cc " +
    "src\\core\\ext\\filters\\client_channel\\channel_connectivity.cc " +
@ -319,7 +320,6 @@ 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
@ -308,6 +308,7 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security.h',
                      'src/core/tsi/transport_security_adapter.h',
                      'src/core/tsi/transport_security_interface.h',
+                      'src/core/ext/transport/chttp2/client/authority.h',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
@ -329,7 +330,6 @@ 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
@ -318,6 +318,7 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security.h',
                      'src/core/tsi/transport_security_adapter.h',
                      'src/core/tsi/transport_security_interface.h',
+                      'src/core/ext/transport/chttp2/client/authority.h',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
@ -339,7 +340,6 @@ 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',
@ -738,6 +738,7 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security_adapter.cc',
                      '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/authority.cc',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
                      'src/core/ext/filters/client_channel/backup_poller.cc',
                      'src/core/ext/filters/client_channel/channel_connectivity.cc',
@ -760,7 +761,6 @@ 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',
@ -898,6 +898,7 @@ Pod::Spec.new do |s|
                              'src/core/tsi/transport_security.h',
                              'src/core/tsi/transport_security_adapter.h',
                              'src/core/tsi/transport_security_interface.h',
+                              'src/core/ext/transport/chttp2/client/authority.h',
                              'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                              'src/core/ext/filters/client_channel/backup_poller.h',
                              'src/core/ext/filters/client_channel/client_channel.h',
@ -919,7 +920,6 @@ 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',
@ -1403,7 +1403,6 @@ 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',
@ -1457,6 +1456,7 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security.h',
                      'src/core/tsi/transport_security_adapter.h',
                      'src/core/tsi/transport_security_interface.h',
+                      'src/core/ext/transport/chttp2/client/authority.h',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                      'src/core/tsi/alts_transport_security.h',
                      'src/core/tsi/fake_transport_security.h',
@ -1671,7 +1671,6 @@ 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',
@ -1736,6 +1735,7 @@ Pod::Spec.new do |s|
                      'src/core/tsi/transport_security_adapter.cc',
                      '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/authority.cc',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
                      'src/core/tsi/alts_transport_security.cc',
                      'src/core/tsi/fake_transport_security.cc',
@ -1955,7 +1955,6 @@ 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',
@ -2009,6 +2008,7 @@ Pod::Spec.new do |s|
                              'src/core/tsi/transport_security.h',
                              'src/core/tsi/transport_security_adapter.h',
                              'src/core/tsi/transport_security_interface.h',
+                              'src/core/ext/transport/chttp2/client/authority.h',
                              'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                              'src/core/tsi/alts_transport_security.h',
                              'src/core/tsi/fake_transport_security.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -249,6 +249,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/tsi/transport_security.h )
  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/authority.h )
  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.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 )
@ -270,7 +271,6 @@ 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 )
@ -672,6 +672,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/tsi/transport_security_adapter.cc )
  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/authority.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.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 )
@ -694,7 +695,6 @@ 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
@ -473,6 +473,7 @@
        'src/core/tsi/transport_security_adapter.cc',
        '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/authority.cc',
        'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
        'src/core/ext/filters/client_channel/backup_poller.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
@ -495,7 +496,6 @@
        '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',
@ -752,7 +752,6 @@
        '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',
@ -983,7 +982,6 @@
        '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',
@ -1204,6 +1202,7 @@
        'src/core/ext/transport/chttp2/server/chttp2_server.cc',
        '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/authority.cc',
        'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
        'src/core/ext/filters/client_channel/backup_poller.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
@ -1226,7 +1225,6 @@
        '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/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@ -258,16 +258,6 @@ typedef struct {
    secure channel is an SSL channel). If this parameter is specified and the
    underlying is not an SSL channel, it will just be ignored. */
 #define GRPC_SSL_TARGET_NAME_OVERRIDE_ARG "grpc.ssl_target_name_override"
-/** This *should* be used for testing only.
-    The caller of the secure_channel_create functions may override the target
-    name used for fake security host name checking using this channel argument
-    which is of type \a GRPC_ARG_STRING. If this argument is not specified, the
-    name used for fake security host name checking will be the target parameter
-    (assuming that the secure channel is a fake security channel). If this
-    parameter is specified and the underlying is not a fake security channel, it
-    will just be ignored. */
-#define GRPC_FAKE_SECURITY_TARGET_NAME_OVERRIDE_ARG \
-  "grpc.fake_security_target_name_override"
 /** If non-zero, a pointer to a session cache (a pointer of type
    grpc_ssl_session_cache*). (use grpc_ssl_session_cache_arg_vtable() to fetch
    an appropriate pointer arg vtable) */
--- a/package.xml
+++ b/package.xml
@ -256,6 +256,7 @@
    <file baseinstalldir="/" name="src/core/tsi/transport_security.h" role="src" />
    <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/authority.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/backup_poller.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel.h" role="src" />
@ -277,7 +278,6 @@
    <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" />
@ -679,6 +679,7 @@
    <file baseinstalldir="/" name="src/core/tsi/transport_security_adapter.cc" role="src" />
    <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/authority.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/backup_poller.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/channel_connectivity.cc" role="src" />
@ -701,7 +702,6 @@
    <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
@ -1,36 +0,0 @@
-/*
- *
- * 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_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H
-#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_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_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H */
--- a/src/core/lib/security/security_connector/security_connector.cc
+++ b/src/core/lib/security/security_connector/security_connector.cc
@ -550,7 +550,7 @@ grpc_channel_security_connector* grpc_fake_channel_security_connector_create(
  c->expected_targets = gpr_strdup(expected_targets);
  c->is_lb_channel = grpc_core::FindTargetAuthorityTableInArgs(args) != nullptr;
  const grpc_arg* target_name_override_arg =
-      grpc_channel_args_find(args, GRPC_FAKE_SECURITY_TARGET_NAME_OVERRIDE_ARG);
+      grpc_channel_args_find(args, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG);
  if (target_name_override_arg != nullptr) {
    c->target_name_override =
        gpr_strdup(grpc_channel_arg_get_string(target_name_override_arg));
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -296,6 +296,7 @@ CORE_SOURCE_FILES = [
    'src/core/tsi/transport_security_adapter.cc',
    '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/authority.cc',
    'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
    'src/core/ext/filters/client_channel/backup_poller.cc',
    'src/core/ext/filters/client_channel/channel_connectivity.cc',
@ -318,7 +319,6 @@ 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/test/core/end2end/tests/call_host_override.cc
+++ b/test/core/end2end/tests/call_host_override.cc
@ -42,7 +42,7 @@ static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config,
  f = config.create_fixture(client_args, server_args);
  grpc_arg fake_security_name_override = {
      GRPC_ARG_STRING,
-      const_cast<char*>(GRPC_FAKE_SECURITY_TARGET_NAME_OVERRIDE_ARG),
+      const_cast<char*>(GRPC_SSL_TARGET_NAME_OVERRIDE_ARG),
      {const_cast<char*>("foo.test.google.fr:1234")}};
  grpc_channel_args* new_client_args = grpc_channel_args_copy_and_add(
      client_args, &fake_security_name_override, 1);
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -9522,8 +9522,7 @@
      "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/transport/chttp2/client/authority.h"
+      "src/core/ext/filters/client_channel/uri_parser.h"
    ], 
    "is_filegroup": true, 
    "language": "c", 
@ -9569,9 +9568,7 @@
      "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/transport/chttp2/client/authority.cc", 
-      "src/core/ext/transport/chttp2/client/authority.h"
+      "src/core/ext/filters/client_channel/uri_parser.h"
    ], 
    "third_party": false, 
    "type": "filegroup"
@ -10220,12 +10217,15 @@
      "grpc_transport_chttp2"
    ], 
    "headers": [
+      "src/core/ext/transport/chttp2/client/authority.h", 
      "src/core/ext/transport/chttp2/client/chttp2_connector.h"
    ], 
    "is_filegroup": true, 
    "language": "c", 
    "name": "grpc_transport_chttp2_client_connector", 
    "src": [
+      "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"
    ],