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

trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc

Index: trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc
===================================================================
--- trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc	(revision 273823)
+++ trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc	(working copy)
@@ -200,14 +200,11 @@
       AwContentBrowserClient::GetAcceptLangsImpl()));
   ApplyCmdlineOverridesToURLRequestContextBuilder(&builder);
 
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-  data_reduction_proxy::DataReductionProxyParams drp_params(
-      data_reduction_proxy::DataReductionProxyParams::kAllowed);
+
   builder.add_http_auth_handler_factory(
       data_reduction_proxy::HttpAuthHandlerDataReductionProxy::Scheme(),
       new data_reduction_proxy::HttpAuthHandlerDataReductionProxy::Factory(
-          drp_params.GetAllowedProxies()));
-#endif
+          DataReductionProxySettings::GetDataReductionProxies()));
 
   url_request_context_.reset(builder.Build());
   // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
@@ -225,21 +222,18 @@
           20 * 1024 * 1024,  // 20M
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
 
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
   AwBrowserContext* browser_context = AwBrowserContext::GetDefault();
   DCHECK(browser_context);
   DataReductionProxySettings* drp_settings =
       browser_context->GetDataReductionProxySettings();
-  if (drp_settings) {
-    std::string drp_key = drp_settings->params()->key();
-    // Only precache credentials if a key is available at URLRequestContext
-    // initialization.
-    if (!drp_key.empty()) {
-    DataReductionProxySettings::InitDataReductionProxySession(
-        main_cache->GetSession(), &drp_params);
-    }
+  DCHECK(drp_settings);
+  std::string drp_key = drp_settings->key();
+  // Only precache credentials if a key is available at URLRequestContext
+  // initialization.
+  if (!drp_key.empty()) {
+  DataReductionProxySettings::InitDataReductionProxySession(
+      main_cache->GetSession(), drp_settings->key());
   }
-#endif
 
   main_http_factory_.reset(main_cache);
   url_request_context_->set_http_transaction_factory(main_cache);