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

trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_metrics.cc

 // Copyright 2014 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 "components/data_reduction_proxy/browser/data_reduction_proxy_metrics.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 283 matching lines @@
  private:
   DailyContentLengthUpdate original_;
   DailyContentLengthUpdate received_;
 };
 
 // Returns true if the request is bypassed by all configured data reduction
 // proxies. It returns the bypass delay in delay_seconds (if not NULL). If
 // the request is bypassed by more than one proxy, delay_seconds returns
 // shortest delay.
 bool IsBypassRequest(const net::URLRequest* request, int64* delay_seconds) {
-  // TODO(bengr): Add support for other data reduction proxy configurations.
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-  DataReductionProxyParams params(
-      DataReductionProxyParams::kAllowed |
-      DataReductionProxyParams::kFallbackAllowed |
-      DataReductionProxyParams::kPromoAllowed);
-  DataReductionProxyParams::DataReductionProxyList proxies =
-      params.GetAllowedProxies();
+  DataReductionProxySettings::DataReductionProxyList proxies =
+      DataReductionProxySettings::GetDataReductionProxies();
   if (proxies.size() == 0)
     return false;
 
   if (request == NULL || request->context() == NULL ||
       request->context()->proxy_service() == NULL) {
     return false;
   }
 
   const net::ProxyRetryInfoMap& retry_map =
       request->context()->proxy_service()->proxy_retry_info();
@@ skipping 12 matching lines @@
     if (found == retry_map.end())
       return false;
     if (shortest_delay == 0 ||
         shortest_delay > found->second.current_delay.InSeconds()) {
       shortest_delay = found->second.current_delay.InSeconds();
     }
   }
   if (delay_seconds != NULL)
     *delay_seconds = shortest_delay;
   return true;
-#else
-  return false;
-#endif
 }
 
 }  // namespace
 
 DataReductionProxyRequestType GetDataReductionProxyRequestType(
     const net::URLRequest* request) {
   if (request->url().SchemeIs("https"))
     return HTTPS;
   if (!request->url().SchemeIs("http")) {
     NOTREACHED();
@@ skipping 183 matching lines @@
   UpdateContentLengthPrefsForDataReductionProxy(
       received_content_length,
       original_content_length,
       with_data_reduction_proxy_enabled,
       request_type,
       base::Time::Now(),
       prefs);
 }
 
 }  // namespace data_reduction_proxy