Remove obsolete logic for inferring QUIC behavior from the name of field trial groups.

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 "chrome/browser/io_thread.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/quic/quic_protocol.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 138 matching lines @@
   command_line_.AppendSwitch("enable-quic-pacing");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   net::QuicTagVector options;
   options.push_back(net::kPACE);
   EXPECT_EQ(options, params.quic_connection_options);
 }
 
-TEST_F(IOThreadTest, EnablePacingFromFieldTrialGroup) {
-  field_trial_group_ = "EnabledWithPacing";
-
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-  net::QuicTagVector options;
-  options.push_back(net::kPACE);
-  EXPECT_EQ(options, params.quic_connection_options);
-}
-
 TEST_F(IOThreadTest, EnablePacingFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["enable_pacing"] = "true";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   net::QuicTagVector options;
   options.push_back(net::kPACE);
   EXPECT_EQ(options, params.quic_connection_options);
 }
 
 TEST_F(IOThreadTest, PacketLengthFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
-  command_line_.AppendSwitchASCII("quic-max-packet-length", "1350");
+  command_line_.AppendSwitchASCII("quic-max-packet-length", "1450");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
-  EXPECT_EQ(1350u, params.quic_max_packet_length);
+  EXPECT_EQ(1450u, params.quic_max_packet_length);
 }
 
-TEST_F(IOThreadTest, PacketLengthFromFieldTrialGroup) {
-  field_trial_group_ = "Enabled1350BytePackets";
+TEST_F(IOThreadTest, PacketLengthFromFieldTrialParams) {
+  field_trial_group_ = "Enabled";
+  field_trial_params_["max_packet_length"] = "1450";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
-  EXPECT_EQ(1350u, params.quic_max_packet_length);
-}
-
-TEST_F(IOThreadTest, PacketLengthFromFieldTrialParams) {
-  field_trial_group_ = "Enabled";
-  field_trial_params_["max_packet_length"] = "1350";
-
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-  EXPECT_EQ(1350u, params.quic_max_packet_length);
+  EXPECT_EQ(1450u, params.quic_max_packet_length);
 }
 
 TEST_F(IOThreadTest, QuicVersionFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   std::string version =
       net::QuicVersionToString(net::QuicSupportedVersions().back());
   command_line_.AppendSwitchASCII("quic-version", version);
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
@@ skipping 122 matching lines @@
   field_trial_group_ = "Enabled";
   field_trial_params_["alternate_protocol_probability_threshold"] = ".5";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(.5, params.alternate_protocol_probability_threshold);
 }
 
 }  // namespace test