Land Recent QUIC Changes until 05/13/2015

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 62 matching lines @@
   }
 
   base::CommandLine command_line_;
   IOThread::Globals globals_;
   std::string field_trial_group_;
   bool is_quic_allowed_by_policy_;
   std::map<std::string, std::string> field_trial_params_;
 };
 
 TEST_F(IOThreadTest, InitializeNetworkSessionParamsFromGlobals) {
-  globals_.quic_connection_options.push_back(net::kPACE);
   globals_.quic_connection_options.push_back(net::kTBBR);
   globals_.quic_connection_options.push_back(net::kTIME);
 
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(globals_.quic_connection_options,
             params.quic_connection_options);
 }
 
 TEST_F(IOThreadTest, SpdyFieldTrialHoldbackEnabled) {
@@ skipping 119 matching lines @@
   command_line_.AppendSwitch("enable-quic");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
   EXPECT_TRUE(params.enable_quic_for_proxies);
   EXPECT_FALSE(IOThread::ShouldEnableQuicForDataReductionProxy());
 }
 
-TEST_F(IOThreadTest, EnablePacingFromCommandLine) {
-  command_line_.AppendSwitch("enable-quic");
-  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, DisableInsecureQuicFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["disable_insecure_quic"] = "true";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.disable_insecure_quic);
 }
 
-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", "1450");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(1450u, params.quic_max_packet_length);
 }
 
@@ skipping 30 matching lines @@
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   net::QuicVersionVector supported_versions;
   supported_versions.push_back(net::QuicSupportedVersions().back());
   EXPECT_EQ(supported_versions, params.quic_supported_versions);
 }
 
 TEST_F(IOThreadTest, QuicConnectionOptionsFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitchASCII("quic-connection-options",
-                                  "PACE,TIME,TBBR,REJ");
+                                  "TIME,TBBR,REJ");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
 
   net::QuicTagVector options;
-  options.push_back(net::kPACE);
   options.push_back(net::kTIME);
   options.push_back(net::kTBBR);
   options.push_back(net::kREJ);
   EXPECT_EQ(options, params.quic_connection_options);
 }
 
 TEST_F(IOThreadTest, QuicConnectionOptionsFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
-  field_trial_params_["connection_options"] = "PACE,TIME,TBBR,REJ";
+  field_trial_params_["connection_options"] = "TIME,TBBR,REJ";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
 
   net::QuicTagVector options;
-  options.push_back(net::kPACE);
   options.push_back(net::kTIME);
   options.push_back(net::kTBBR);
   options.push_back(net::kREJ);
   EXPECT_EQ(options, params.quic_connection_options);
 }
 
 TEST_F(IOThreadTest,
        QuicAlwaysRequireHandshakeConfirmationFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["always_require_handshake_confirmation"] = "true";
@@ skipping 121 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