QUIC - don't load data from disk cache if alternate protocol map doesn't

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 115 matching lines @@
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
   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_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, EnableQuicFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
 }
@@ skipping 142 matching lines @@
 
 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, QuicDisableLoadingServerInfoForNewServers) {
+  field_trial_group_ = "Enabled";
+  field_trial_params_["disable_loading_server_info_for_new_servers"] = "true";
+  ConfigureQuicGlobals();
+  net::HttpNetworkSession::Params params;
+  InitializeNetworkSessionParams(&params);
+  EXPECT_TRUE(params.quic_disable_loading_server_info_for_new_servers);

[Ryan Hamilton, 2014/12/18 21:12:55]

please add an EXPECT_FALSE for this field up to the first test (Which verifies
the defaults).

[ramant (doing other things), 2014/12/18 23:05:55]

Done.

+}
+
 TEST_F(IOThreadTest,
        AlternateProtocolProbabilityThresholdFromFlag) {
   command_line_.AppendSwitchASCII("alternate-protocol-probability-threshold",
                                   ".5");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(.5, params.alternate_protocol_probability_threshold);
 }
@@ skipping 13 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