Commit 3186150d authored by rtenneti@chromium.org's avatar rtenneti@chromium.org

QUIC - persist server config in stable and beta channels.

BUG=377408
R=jar@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/303253003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274112 0039d316-1c4b-4281-b951-d872f2087c98
parent e71a8942
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h"
#include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h" #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
#include "components/data_reduction_proxy/browser/http_auth_handler_data_reduction_proxy.h" #include "components/data_reduction_proxy/browser/http_auth_handler_data_reduction_proxy.h"
...@@ -1159,16 +1158,9 @@ bool IOThread::ShouldEnableQuicTimeBasedLossDetection( ...@@ -1159,16 +1158,9 @@ bool IOThread::ShouldEnableQuicTimeBasedLossDetection(
kQuicFieldTrialTimeBasedLossDetectionSuffix); kQuicFieldTrialTimeBasedLossDetectionSuffix);
} }
// TODO(rtenneti): Delete this method after the merge.
bool IOThread::ShouldEnableQuicPersistServerInfo( bool IOThread::ShouldEnableQuicPersistServerInfo(
const CommandLine& command_line) { 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; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment