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

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 094d043fadbde49b79e8441815d93fd4076f0742..b5341078d807c8dd145099d809194957d46fc36e 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -1053,6 +1053,8 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
       &params->quic_disable_connection_pooling);
   globals.quic_load_server_info_timeout_ms.CopyToIfSet(
       &params->quic_load_server_info_timeout_ms);
+  globals.quic_load_server_info_if_already_spoke_quic.CopyToIfSet(
+      &params->quic_load_server_info_if_already_spoke_quic);
   globals.enable_quic_port_selection.CopyToIfSet(
       &params->enable_quic_port_selection);
   globals.quic_max_packet_length.CopyToIfSet(&params->quic_max_packet_length);
@@ -1203,6 +1205,8 @@ void IOThread::ConfigureQuicGlobals(
       globals->quic_load_server_info_timeout_ms.set(
           load_server_info_timeout_ms);
     }
+    globals->quic_load_server_info_if_already_spoke_quic.set(
+        ShouldQuicLoadServerInfoIfAlreadySpokeQuic(quic_trial_params));
     globals->enable_quic_port_selection.set(
         ShouldEnableQuicPortSelection(command_line));
     globals->quic_connection_options =
@@ -1367,6 +1371,13 @@ int IOThread::GetQuicLoadServerInfoTimeout(
 }
 
 // static
+bool IOThread::ShouldQuicLoadServerInfoIfAlreadySpokeQuic(
+    const VariationParameters& quic_trial_params) {
+  return LowerCaseEqualsASCII(GetVariationParam(
+      quic_trial_params, "load_server_info_if_already_spoke_quic"), "true");

[Ryan Hamilton, 2014/12/18 19:19:12]

To confirm, are you expecting to get the old behavior in the default case, or
the new behavrior in the default case?

[ramant (doing other things), 2014/12/18 20:51:10]

Old behavior in the default case. New behavior when the FieldTrial is on.

+}
+
+// static
 size_t IOThread::GetQuicMaxPacketLength(
     const CommandLine& command_line,
     base::StringPiece quic_trial_group,