Remove features::kTokenBinding

Bug: 875046
Change-Id: I1926513d3b4ad703306a7ff291ac7a9e7e47966b
Reviewed-on: https://chromium-review.googlesource.com/1178980Reviewed-by: Bence Béky <bnc@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Nick Harper <nharper@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584532}

chrome/browser/about_flags.cc

@@ -2593,9 +2593,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"tls13-variant", flag_descriptions::kTLS13VariantName,
      flag_descriptions::kTLS13VariantDescription, kOsAll,
      MULTI_VALUE_TYPE(kTLS13VariantChoices)},
-    {"enable-token-binding", flag_descriptions::kEnableTokenBindingName,
-     flag_descriptions::kEnableTokenBindingDescription, kOsAll,
-     FEATURE_VALUE_TYPE(features::kTokenBinding)},
     {"enable-scroll-anchor-serialization",
      flag_descriptions::kEnableScrollAnchorSerializationName,
      flag_descriptions::kEnableScrollAnchorSerializationDescription, kOsAll,

chrome/browser/extensions/extension_messages_apitest.cc

@@ -1146,8 +1146,7 @@ IN_PROC_BROWSER_TEST_P(ExternallyConnectableMessagingTest,
   std::string expected_tls_channel_id_value =
       CreateTlsChannelId(profile()->GetRequestContext(), chromium_org_url());
   bool expect_empty_id = false;
-  if (!base::FeatureList::IsEnabled(::features::kChannelID) &&
-      !base::FeatureList::IsEnabled(::features::kTokenBinding)) {
+  if (!base::FeatureList::IsEnabled(::features::kChannelID)) {
     expected_tls_channel_id_value = "";
     expect_empty_id = true;
   }
@@ -1208,10 +1207,7 @@ class ExternallyConnectableMessagingTestNoChannelID
   ~ExternallyConnectableMessagingTestNoChannelID() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    std::vector<base::Feature> enabled_features;
-    std::vector<base::Feature> disabled_features = {::features::kChannelID,
-                                                    ::features::kTokenBinding};
-    scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features);
+    scoped_feature_list_.InitAndDisableFeature(::features::kChannelID);
     ExternallyConnectableMessagingTest::SetUpCommandLine(command_line);
   }
 
@@ -1470,8 +1466,7 @@ IN_PROC_BROWSER_TEST_P(MessagingApiTest,
   std::string tls_channel_id = CreateTlsChannelId(
       app_storage_partition->GetURLRequestContext(), background_url);
   ASSERT_FALSE(tls_channel_id.empty());
-  if (!base::FeatureList::IsEnabled(::features::kChannelID) &&
-      !base::FeatureList::IsEnabled(::features::kTokenBinding)) {
+  if (!base::FeatureList::IsEnabled(::features::kChannelID)) {
     tls_channel_id = "undefined";
   }
 

chrome/browser/flag_descriptions.cc

@@ -766,9 +766,6 @@ const char kEnableSyncUSSSessionsDescription[] =
     "Enables the new, experimental implementation of session sync (aka tab "
     "sync).";
 
-const char kEnableTokenBindingName[] = "Token Binding.";
-const char kEnableTokenBindingDescription[] = "Enable Token Binding support.";
-
 const char kEnableUseZoomForDsfName[] =
     "Use Blink's zoom for device scale factor.";
 const char kEnableUseZoomForDsfDescription[] =

chrome/browser/flag_descriptions.h

@@ -479,9 +479,6 @@ extern const char kEnableSyncUSSBookmarksDescription[];
 extern const char kEnableSyncUSSSessionsName[];
 extern const char kEnableSyncUSSSessionsDescription[];
 
-extern const char kEnableTokenBindingName[];
-extern const char kEnableTokenBindingDescription[];
-
 extern const char kEnableUseZoomForDsfName[];
 extern const char kEnableUseZoomForDsfDescription[];
 extern const char kEnableUseZoomForDsfChoiceDefault[];

components/network_session_configurator/browser/network_session_configurator.cc

@@ -591,8 +591,6 @@ void ParseCommandLineAndFieldTrials(const base::CommandLine& command_line,
         command_line.GetSwitchValueASCII(switches::kHostRules));
   }
 
-  params->enable_token_binding =
-      base::FeatureList::IsEnabled(features::kTokenBinding);
   params->enable_channel_id =
       base::FeatureList::IsEnabled(features::kChannelID);
 }

components/network_session_configurator/browser/network_session_configurator_unittest.cc

@@ -708,25 +708,12 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
 }
 
 TEST_F(NetworkSessionConfiguratorTest, TokenBindingDisabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndDisableFeature(features::kTokenBinding);
-
   base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   ParseCommandLineAndFieldTrials(command_line);
 
   EXPECT_FALSE(params_.enable_token_binding);
 }
 
-TEST_F(NetworkSessionConfiguratorTest, TokenBindingEnabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(features::kTokenBinding);
-
-  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
-  ParseCommandLineAndFieldTrials(command_line);
-
-  EXPECT_TRUE(params_.enable_token_binding);
-}
-
 TEST_F(NetworkSessionConfiguratorTest, ChannelIDEnabled) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(features::kChannelID);

components/network_session_configurator/common/network_features.cc

@@ -8,9 +8,6 @@
 
 namespace features {
 
-const base::Feature kTokenBinding{"token-binding",
-                                  base::FEATURE_DISABLED_BY_DEFAULT};
-
 // TODO(nharper): Disable kChannelID on all platforms in M69.
 const base::Feature kChannelID{"channel-id", base::FEATURE_ENABLED_BY_DEFAULT};
 

components/network_session_configurator/common/network_features.h

@@ -10,10 +10,6 @@
 
 namespace features {
 
-// Enables token binding
-// (https://www.ietf.org/id/draft-ietf-tokbind-protocol-04.txt).
-NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
-
 // Enables Channel ID.
 NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;