Change how QUIC negotiates pacing from congestion feedback to QUIC

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 109 matching lines @@
 }
 
 TEST_F(IOThreadTest, EnableQuicFromFieldTrialGroup) {
   field_trial_group_ = "Enabled";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params default_params;
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
-  EXPECT_FALSE(params.enable_quic_pacing);
   EXPECT_FALSE(params.enable_quic_time_based_loss_detection);
   EXPECT_EQ(1350u, params.quic_max_packet_length);
   EXPECT_EQ(default_params.quic_supported_versions,
             params.quic_supported_versions);
   EXPECT_EQ(net::QuicTagVector(), params.quic_connection_options);
 }
 
 TEST_F(IOThreadTest, EnableQuicFromCommandLine) {
   base::CommandLine::StringVector args;
   command_line_.AppendSwitch("enable-quic");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
 }
 
 TEST_F(IOThreadTest, EnablePacingFromCommandLine) {
   base::CommandLine::StringVector args;
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitch("enable-quic-pacing");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
-  EXPECT_TRUE(params.enable_quic_pacing);
+  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);
-  EXPECT_TRUE(params.enable_quic_pacing);
+  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);
-  EXPECT_TRUE(params.enable_quic_pacing);
+  net::QuicTagVector options;
+  options.push_back(net::kPACE);
+  EXPECT_EQ(options, params.quic_connection_options);
 }
 
 TEST_F(IOThreadTest, EnableTimeBasedLossDetectionFromCommandLine) {
   base::CommandLine::StringVector args;
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitch("enable-quic-time-based-loss-detection");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
@@ skipping 107 matching lines @@
 
   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);
 }
 
 }  // namespace test