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

trunk/src/android_webview/browser/net/aw_url_request_context_getter.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 "android_webview/browser/net/aw_url_request_context_getter.h"
 
 #include <vector>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
@@ skipping 182 matching lines @@
   builder.set_user_agent(GetUserAgent());
   builder.set_network_delegate(new AwNetworkDelegate());
 #if !defined(DISABLE_FTP_SUPPORT)
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.
 #endif
   builder.set_proxy_config_service(proxy_config_service_.release());
   builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader(
       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.
   net::HttpNetworkSession::Params network_session_params;
 
   PopulateNetworkSessionParams(url_request_context_.get(),
                                &network_session_params);
 
   net::HttpCache* main_cache = new net::HttpCache(
       network_session_params,
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
           net::CACHE_BACKEND_SIMPLE,
           partition_path_.Append(FILE_PATH_LITERAL("Cache")),
           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);
   url_request_context_->set_cookie_store(cookie_store_);
 
   job_factory_ = CreateJobFactory(&protocol_handlers_);
   url_request_context_->set_job_factory(job_factory_.get());
 }
 
 net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
@@ skipping 14 matching lines @@
   std::swap(protocol_handlers_, *protocol_handlers);
 }
 
 DataReductionProxyConfigService*
 AwURLRequestContextGetter::proxy_config_service() {
   // TODO(bengr): return system config if data reduction proxy is disabled.
   return proxy_config_service_.get();
 }
 
 }  // namespace android_webview