Merge 274112 "QUIC - persist server config in stable and beta ch..."

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
===================================================================
--- chrome/browser/io_thread.cc	(revision 274651)
+++ chrome/browser/io_thread.cc	(working copy)
@@ -1163,16 +1163,9 @@
       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;
 }