QUIC - minor cleanup of the following field trials and used defaults for

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 "chrome/browser/io_thread.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
@@ skipping 117 matching lines @@
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
   EXPECT_TRUE(params.enable_quic_for_proxies);
   EXPECT_EQ(1350u, params.quic_max_packet_length);
   EXPECT_EQ(1.0, params.alternate_protocol_probability_threshold);
   EXPECT_EQ(default_params.quic_supported_versions,
             params.quic_supported_versions);
   EXPECT_EQ(net::QuicTagVector(), params.quic_connection_options);
   EXPECT_FALSE(params.quic_always_require_handshake_confirmation);
   EXPECT_FALSE(params.quic_disable_connection_pooling);
-  EXPECT_EQ(0, params.quic_load_server_info_timeout_ms);
-  EXPECT_EQ(0.0f, params.quic_load_server_info_timeout_srtt_multiplier);
-  EXPECT_FALSE(params.quic_enable_truncated_connection_ids);
+  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(IOThread::ShouldEnableQuicForDataReductionProxy());
 }
 
 TEST_F(IOThreadTest, EnableQuicFromQuicProxyFieldTrialGroup) {
   base::FieldTrialList field_trial_list(new BadEntropyProvider());
   base::FieldTrialList::CreateFieldTrial(
       data_reduction_proxy::DataReductionProxyParams::GetQuicFieldTrialName(),
@@ skipping 136 matching lines @@
 TEST_F(IOThreadTest,
        QuicDisableConnectionPoolingFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["disable_connection_pooling"] = "true";
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.quic_disable_connection_pooling);
 }
 
-TEST_F(IOThreadTest, QuicLoadServerInfoTimeoutFromFieldTrialParams) {
-  field_trial_group_ = "Enabled";
-  field_trial_params_["load_server_info_timeout"] = "50";
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-  EXPECT_EQ(50, params.quic_load_server_info_timeout_ms);
-}
-
 TEST_F(IOThreadTest, QuicLoadServerInfoTimeToSmoothedRttFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["load_server_info_time_to_srtt"] = "0.5";
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(0.5f, params.quic_load_server_info_timeout_srtt_multiplier);
 }
 
-TEST_F(IOThreadTest, QuicEnableTruncatedConnectionIds) {
-  field_trial_group_ = "Enabled";
-  field_trial_params_["enable_truncated_connection_ids"] = "true";
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-  EXPECT_TRUE(params.quic_enable_truncated_connection_ids);
-}
-
 TEST_F(IOThreadTest, QuicEnableConnectionRacing) {
   field_trial_group_ = "Enabled";
   field_trial_params_["enable_connection_racing"] = "true";
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.quic_enable_connection_racing);
 }
 
 TEST_F(IOThreadTest, QuicEnableNonBlockingIO) {
@@ skipping 49 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