QUIC - added disable_delay_tcp_race field trial param to disable

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 <stddef.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
@@ skipping 233 matching lines @@
   EXPECT_FALSE(params_.quic_disable_connection_pooling);
   EXPECT_EQ(0.25f, params_.quic_load_server_info_timeout_srtt_multiplier);
   EXPECT_FALSE(params_.quic_enable_connection_racing);
   EXPECT_FALSE(params_.quic_enable_non_blocking_io);
   EXPECT_FALSE(params_.quic_disable_disk_cache);
   EXPECT_FALSE(params_.quic_prefer_aes);
   EXPECT_TRUE(params_.parse_alternative_services);
   EXPECT_FALSE(params_.enable_alternative_service_with_different_host);
   EXPECT_EQ(0, params_.quic_max_number_of_lossy_connections);
   EXPECT_EQ(1.0f, params_.quic_packet_loss_threshold);
-  EXPECT_FALSE(params_.quic_delay_tcp_race);
+  EXPECT_TRUE(params_.quic_delay_tcp_race);
   EXPECT_FALSE(params_.quic_close_sessions_on_ip_change);
   EXPECT_EQ(net::kIdleConnectionTimeoutSeconds,
             params_.quic_idle_connection_timeout_seconds);
   EXPECT_FALSE(params_.quic_disable_preconnect_if_0rtt);
   EXPECT_FALSE(params_.quic_migrate_sessions_on_network_change);
   EXPECT_FALSE(params_.quic_migrate_sessions_early);
   EXPECT_TRUE(params_.quic_host_whitelist.empty());
 
   net::HttpNetworkSession::Params default_params;
   EXPECT_EQ(default_params.quic_supported_versions,
@@ skipping 305 matching lines @@
   std::map<std::string, std::string> field_trial_params;
   field_trial_params["receive_buffer_size"] = "2097152";
   variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
   base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
 
   ParseFieldTrials();
 
   EXPECT_EQ(2097152, params_.quic_socket_receive_buffer_size);
 }
 
-TEST_F(NetworkSessionConfiguratorTest, QuicDelayTcpConnection) {
+TEST_F(NetworkSessionConfiguratorTest, QuicDisableDelayTcpRace) {
   std::map<std::string, std::string> field_trial_params;
-  field_trial_params["delay_tcp_race"] = "true";
+  field_trial_params["disable_delay_tcp_race"] = "true";
   variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
   base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
 
   ParseFieldTrials();
 
-  EXPECT_TRUE(params_.quic_delay_tcp_race);
+  EXPECT_FALSE(params_.quic_delay_tcp_race);
 }
 
 TEST_F(NetworkSessionConfiguratorTest, QuicOriginsToForceQuicOn) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch("enable-quic");
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       "origin-to-force-quic-on", "www.example.com:443, www.example.org:443");
 
   ParseFieldTrialsAndCommandLine();
 
   EXPECT_EQ(2u, params_.origins_to_force_quic_on.size());
@@ skipping 227 matching lines @@
       &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType,
       base::Unretained(this), "acc1"));
   pref_service()->SetString(prefs::kAuthAndroidNegotiateAccountType, "acc2");
   RunOnIOThreadBlocking(base::Bind(
       &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType,
       base::Unretained(this), "acc2"));
 }
 #endif
 
 }  // namespace test