| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index 6893de8ce4dbc79f20e8766781c2043ddf600e04..e4fa02deab4c16507a5995706e875e7034fe7906 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -39,7 +39,6 @@
|
| #include "chrome/browser/net/sdch_dictionary_fetcher.h"
|
| #include "chrome/common/chrome_content_client.h"
|
| #include "chrome/common/chrome_switches.h"
|
| -#include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/pref_names.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"
|
| @@ -1146,16 +1145,9 @@ bool IOThread::ShouldEnableQuicTimeBasedLossDetection(
|
| kQuicFieldTrialTimeBasedLossDetectionSuffix);
|
| }
|
|
|
| +// TODO(rtenneti): Delete this method after the merge.
|
| 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;
|
| }
|
|
|
|
|