Avoid persisting of QUIC server config information in Stable and Beta

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 998 matching lines @@
   globals_->enable_spdy_ping_based_connection_checking.CopyToIfSet(
       &params->enable_spdy_ping_based_connection_checking);
   globals_->spdy_default_protocol.CopyToIfSet(
       &params->spdy_default_protocol);
   globals_->trusted_spdy_proxy.CopyToIfSet(
       &params->trusted_spdy_proxy);
   globals_->enable_quic.CopyToIfSet(&params->enable_quic);
   globals_->enable_quic_https.CopyToIfSet(&params->enable_quic_https);
   globals_->enable_quic_pacing.CopyToIfSet(
       &params->enable_quic_pacing);
+  globals_->enable_quic_persist_server_info.CopyToIfSet(
+      &params->enable_quic_persist_server_info);
   globals_->enable_quic_port_selection.CopyToIfSet(
       &params->enable_quic_port_selection);
   globals_->quic_max_packet_length.CopyToIfSet(&params->quic_max_packet_length);
   globals_->quic_supported_versions.CopyToIfSet(
       &params->quic_supported_versions);
   globals_->origin_to_force_quic_on.CopyToIfSet(
       &params->origin_to_force_quic_on);
   params->enable_user_alternate_protocol_ports =
       globals_->enable_user_alternate_protocol_ports;
 }
@@ skipping 71 matching lines @@
   std::string quic_trial_group =
       base::FieldTrialList::FindFullName(kQuicFieldTrialName);
 
   bool enable_quic = ShouldEnableQuic(command_line, quic_trial_group);
   globals_->enable_quic.set(enable_quic);
   if (enable_quic) {
     globals_->enable_quic_https.set(
         ShouldEnableQuicHttps(command_line, quic_trial_group));
     globals_->enable_quic_pacing.set(
         ShouldEnableQuicPacing(command_line, quic_trial_group));
+    globals_->enable_quic_persist_server_info.set(
+        ShouldEnableQuicPersistServerInfo(command_line));
     globals_->enable_quic_port_selection.set(
         ShouldEnableQuicPortSelection(command_line));
   }
 
   size_t max_packet_length = GetQuicMaxPacketLength(command_line,
                                                     quic_trial_group);
   if (max_packet_length != 0) {
     globals_->quic_max_packet_length.set(max_packet_length);
   }
 
@@ skipping 69 matching lines @@
                                       base::StringPiece quic_trial_group) {
   if (command_line.HasSwitch(switches::kEnableQuicPacing))
     return true;
 
   if (command_line.HasSwitch(switches::kDisableQuicPacing))
     return false;
 
   return quic_trial_group.ends_with(kQuicFieldTrialPacingSuffix);
 }
 
+bool IOThread::ShouldEnableQuicPersistServerInfo(
+    const CommandLine& command_line) {
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  // Avoid persisting of Quic server config information to disk cache when we
+  // have a beta or stable release.  Allow in all other cases, including when we
+  // do a developer build (CHANNEL_UNKNOWN).
+  if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
+      channel == chrome::VersionInfo::CHANNEL_BETA) {
+    return false;
+  }
+  return true;
+}
+
 size_t IOThread::GetQuicMaxPacketLength(const CommandLine& command_line,
                                         base::StringPiece quic_trial_group) {
   if (command_line.HasSwitch(switches::kQuicMaxPacketLength)) {
     unsigned value;
     if (!base::StringToUint(
             command_line.GetSwitchValueASCII(switches::kQuicMaxPacketLength),
             &value)) {
       return 0;
     }
     return value;
@@ skipping 28 matching lines @@
   std::string version_flag =
       command_line.GetSwitchValueASCII(switches::kQuicVersion);
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == version_flag) {
       return version;
     }
   }
   return net::QUIC_VERSION_UNSUPPORTED;
 }