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

chrome/browser/io_thread_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/test/mock_entropy_provider.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
@@ skipping 125 matching lines @@
   field_trial_params_["enable_http2"] = "true";
   field_trial_group_ = "ParametrizedHTTP2Only";
   ConfigureSpdyGlobals();
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11, net::kProtoSPDY4));
   bool use_alternate_protocols = false;
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   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.
   field_trial_group_ = "Spdy4Enabled";
   ConfigureSpdyGlobals();
   EXPECT_EQ(0u, globals_.next_protos.size());
 }
 
 TEST_F(IOThreadTest, SpdyCommandLineUseSpdyDisableAltProtocols) {
   command_line_.AppendSwitchASCII("use-spdy", "no-alt-protocols");
@@ skipping 305 matching lines @@
   command_line_.AppendSwitch(switches::kEnableQuic);
   is_quic_allowed_by_policy_ = false;
   ConfigureQuicGlobals();
 
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_FALSE(params.enable_quic);
 }
 
 }  // namespace test