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

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

Index: trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_metrics.cc
===================================================================
--- trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_metrics.cc	(revision 273823)
+++ trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_metrics.cc	(working copy)
@@ -301,14 +301,8 @@
 // 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;
 
@@ -341,9 +335,6 @@
   if (delay_seconds != NULL)
     *delay_seconds = shortest_delay;
   return true;
-#else
-  return false;
-#endif
 }
 
 }  // namespace