Remove --enable-spdy4 and --enable-npn-http command line flags.

Remove --enable-spdy4 and --enable-npn-http command line flags that used to
force enable and disable both of HTTP/2 and SPDY/3.1, respectively.  They are
obsolete because
 * these protocols are not experimental any more,
 * they are enabled by default,
 * usage of disabling flag is very low and it is unlikely that these flags will
   ever be needed for debugging.

BUG=

Review URL: https://codereview.chromium.org/1130353003

Cr-Commit-Position: refs/heads/master@{#329407}

4 files changed, 0 insertions, 45 deletions

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index e9b9e59..55767a7 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -1025,18 +1025,6 @@ void IOThread::ConfigureSpdyGlobals(
     globals->next_protos.push_back(net::kProtoQUIC1SPDY3);
   }
 
-  if (command_line.HasSwitch(switches::kEnableSpdy4)) {
-    globals->next_protos.push_back(net::kProtoSPDY31);
-    globals->next_protos.push_back(net::kProtoSPDY4_14);
-    globals->next_protos.push_back(net::kProtoSPDY4);
-    globals->use_alternate_protocols.set(true);
-    return;
-  }
-  if (command_line.HasSwitch(switches::kEnableNpnHttpOnly)) {
-    globals->use_alternate_protocols.set(false);
-    return;
-  }
-
   // No SPDY command-line flags have been specified. Examine trial groups.
   if (spdy_trial_group.starts_with(kSpdyFieldTrialHoldbackGroupNamePrefix)) {
     net::HttpStreamFactory::set_spdy_enabled(false);
diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc
index de1d286..13b21fc 100644
--- a/chrome/browser/io_thread_unittest.cc
+++ b/chrome/browser/io_thread_unittest.cc
@@ -143,30 +143,6 @@ TEST_F(IOThreadTest, SpdyFieldTrialParametrized) {
   EXPECT_TRUE(use_alternate_protocols);
 }
 
-TEST_F(IOThreadTest, SpdyCommandLineEnable) {
-  command_line_.AppendSwitch("enable-spdy4");
-  // Command line should overwrite field trial group.
-  field_trial_group_ = "SpdyDisabled";
-  ConfigureSpdyGlobals();
-  EXPECT_THAT(globals_.next_protos,
-              ElementsAre(net::kProtoHTTP11, net::kProtoSPDY31,
-                          net::kProtoSPDY4_14, net::kProtoSPDY4));
-  bool use_alternate_protocols = false;
-  globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
-  EXPECT_TRUE(use_alternate_protocols);
-}
-
-TEST_F(IOThreadTest, SpdyCommandLineDisable) {
-  command_line_.AppendSwitch("enable-npn-http");
-  // Command line should overwrite field trial group.
-  field_trial_group_ = "Spdy4Enabled";
-  ConfigureSpdyGlobals();
-  EXPECT_THAT(globals_.next_protos, ElementsAre(net::kProtoHTTP11));
-  bool use_alternate_protocols = true;
-  globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
-  EXPECT_FALSE(use_alternate_protocols);
-}
-
 TEST_F(IOThreadTest, SpdyCommandLineUseSpdyOff) {
   command_line_.AppendSwitchASCII("use-spdy", "off");
   // Command line should overwrite field trial group.
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 5417ced..25575f7 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -469,10 +469,6 @@ const char kEnableNetBenchmarking[]         = "enable-net-benchmarking";
 // Enables the new bookmark app system.
 const char kEnableNewBookmarkApps[]         = "enable-new-bookmark-apps";
 
-// Enables NPN with HTTP. It means NPN is enabled but SPDY won't be used.
-// HTTP is still used for all requests.
-const char kEnableNpnHttpOnly[]             = "enable-npn-http";
-
 // Enable auto-reload of error pages if offline.
 const char kEnableOfflineAutoReload[]       = "enable-offline-auto-reload";
 
@@ -541,9 +537,6 @@ const char kDisableSettingsWindow[]          = "disable-settings-window";
 // allocates certain resources accordingly.
 const char kEnableSiteEngagementService[]   = "enable-site-engagement-service";
 
-// Enable SPDY/4, aka HTTP/2. This is a temporary testing flag.
-const char kEnableSpdy4[]                   = "enable-spdy4";
-
 // Enables the suggestions service.
 const char kEnableSuggestionsService[]      = "enable-suggestions-service";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index bd42093..fcd5a33 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -136,7 +136,6 @@ extern const char kEnableMediaRouter[];
 extern const char kEnableNaCl[];
 extern const char kEnableNetBenchmarking[];
 extern const char kEnableNewBookmarkApps[];
-extern const char kEnableNpnHttpOnly[];
 extern const char kEnableOfflineAutoReload[];
 extern const char kEnableOfflineAutoReloadVisibleOnly[];
 extern const char kEnablePanels[];
@@ -157,7 +156,6 @@ extern const char kEnableSessionCrashedBubble[];
 extern const char kEnableSettingsWindow[];
 extern const char kDisableSettingsWindow[];
 extern const char kEnableSiteEngagementService[];
-extern const char kEnableSpdy4[];
 extern const char kEnableSuggestionsService[];
 extern const char kEnableSupervisedUserManagedBookmarksFolder[];
 extern const char kEnableSyncArticles[];