Revert 273810 "Added alternative configuration for the data redu..."

trunk/src/chrome/browser/net/predictor.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/net/predictor.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <sstream>
@@ skipping 319 matching lines @@
   // Data.
   user_prefs->ClearPref(prefs::kDnsPrefetchingStartupList);
   user_prefs->ClearPref(prefs::kDnsPrefetchingHostReferralList);
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
   // TODO(marq): Once https://codereview.chromium.org/30883003/ lands, also
   // condition this on DataReductionProxySettings::IsDataReductionProxyAllowed()
   // Until then, we may create a proxy advisor when the proxy feature itself
   // isn't available, and the advisor instance will never send advisory
   // requests, which is slightly wasteful but not harmful.
-  if (data_reduction_proxy::DataReductionProxyParams::
-      IsIncludedInPreconnectHintingFieldTrial()) {
+  if (data_reduction_proxy::DataReductionProxySettings::
+          IsPreconnectHintingAllowed()) {
     proxy_advisor_.reset(new ProxyAdvisor(user_prefs, getter));
   }
 #endif
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(
           &Predictor::FinalizeInitializationOnIOThread,
           base::Unretained(this),
@@ skipping 1111 matching lines @@
     IOThread* io_thread,
     net::URLRequestContextGetter* getter) {
   // Empty function for unittests.
 }
 
 void SimplePredictor::ShutdownOnUIThread() {
   SetShutdown(true);
 }
 
 }  // namespace chrome_browser_net