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

chrome/browser/io_thread.cc

 // Copyright (c) 2012 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 "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 1035 matching lines @@
   globals.alternate_protocol_probability_threshold.CopyToIfSet(
       &params->alternate_protocol_probability_threshold);
 
   globals.enable_quic.CopyToIfSet(&params->enable_quic);
   globals.quic_always_require_handshake_confirmation.CopyToIfSet(
       &params->quic_always_require_handshake_confirmation);
   globals.quic_disable_connection_pooling.CopyToIfSet(
       &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);
   globals.quic_user_agent_id.CopyToIfSet(&params->quic_user_agent_id);
   globals.quic_supported_versions.CopyToIfSet(
       &params->quic_supported_versions);
   params->quic_connection_options = globals.quic_connection_options;
 
   globals.origin_to_force_quic_on.CopyToIfSet(
       &params->origin_to_force_quic_on);
@@ skipping 130 matching lines @@
     globals->quic_always_require_handshake_confirmation.set(
         ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params));
     globals->quic_disable_connection_pooling.set(
         ShouldQuicDisableConnectionPooling(quic_trial_params));
     int load_server_info_timeout_ms =
         GetQuicLoadServerInfoTimeout(quic_trial_params);
     if (load_server_info_timeout_ms != 0) {
       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 =
         GetQuicConnectionOptions(command_line, quic_trial_params);
     if (ShouldEnableQuicPacing(command_line, quic_trial_group,
                                quic_trial_params)) {
       globals->quic_connection_options.push_back(net::kPACE);
     }
   }
 
@@ skipping 144 matching lines @@
   int value;
   if (base::StringToInt(GetVariationParam(quic_trial_params,
                                           "load_server_info_timeout"),
                         &value)) {
     return value;
   }
   return 0;
 }
 
 // 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,
     const VariationParameters& quic_trial_params) {
   if (command_line.HasSwitch(switches::kQuicMaxPacketLength)) {
     unsigned value;
     if (!base::StringToUint(
             command_line.GetSwitchValueASCII(switches::kQuicMaxPacketLength),
             &value)) {
       return 0;
@@ skipping 27 matching lines @@
   net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == quic_version) {
       return version;
     }
   }
 
   return net::QUIC_VERSION_UNSUPPORTED;
 }