Move data reduction proxy logic out of chrome and android webview network delegate

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 7cbcf7b3bdcef08d97f8b0ca10cc0fd8e65e657d..b2bf6c83ddce76495d9207fdb0a3e22b4e4175a9 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -43,6 +43,7 @@
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
@@ -584,18 +585,30 @@ void IOThread::InitAsync() {
       extension_event_router_forwarder_;
 #endif
 
-  ChromeNetworkDelegate* network_delegate =
+  scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate(
       new ChromeNetworkDelegate(extension_event_router_forwarder(),
-                                &system_enable_referrers_);
+                                &system_enable_referrers_));
 
   if (command_line.HasSwitch(switches::kEnableClientHints))
-    network_delegate->SetEnableClientHints();
+    chrome_network_delegate->SetEnableClientHints();
 
 #if defined(ENABLE_EXTENSIONS)
   if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling))
-    network_delegate->NeverThrottleRequests();
+    chrome_network_delegate->NeverThrottleRequests();
 #endif
 
+  SetupDataReductionProxy();
+
+  // This is the same as in ProfileImplIOData except that we do not collect
+  // usage stats.

[mmenke, 2014/12/03 18:50:38]

nit:  Don't use "we" in comments.

[megjablon, 2014/12/04 01:23:46]

Done.

+  data_reduction_proxy::DataReductionProxyNetworkDelegate* network_delegate =
+      new data_reduction_proxy::DataReductionProxyNetworkDelegate(
+          chrome_network_delegate.Pass(),
+          globals_->data_reduction_proxy_params.get(),
+          globals_->data_reduction_proxy_auth_request_handler.get(),
+          data_reduction_proxy::DataReductionProxyNetworkDelegate::
+              ProxyConfigGetter());
+
   globals_->system_network_delegate.reset(network_delegate);
   globals_->host_resolver = CreateGlobalHostResolver(net_log_);
   UpdateDnsClientEnabled();
@@ -644,8 +657,6 @@ void IOThread::InitAsync() {
 
   globals_->ssl_config_service = GetSSLConfigService();
 
-  SetupDataReductionProxy(network_delegate);
-
   globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(
       globals_->host_resolver.get()));
   globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl());
@@ -1135,8 +1146,7 @@ void IOThread::ConfigureQuic(const CommandLine& command_line) {
   ConfigureQuicGlobals(command_line, group, params, globals_);
 }
 
-void IOThread::SetupDataReductionProxy(
-    ChromeNetworkDelegate* network_delegate) {
+void IOThread::SetupDataReductionProxy() {
   // TODO(kundaji): Move flags initialization to DataReductionProxyParams and
   // merge with flag initialization in
   // data_reduction_proxy_chrome_settings_factory.cc.
@@ -1162,14 +1172,6 @@ void IOThread::SetupDataReductionProxy(
       new data_reduction_proxy::DataReductionProxyDelegate(
           globals_->data_reduction_proxy_auth_request_handler.get(),
           globals_->data_reduction_proxy_params.get()));
-  // This is the same as in ProfileImplIOData except that we do not collect
-  // usage stats.
-  network_delegate->set_data_reduction_proxy_params(
-      globals_->data_reduction_proxy_params.get());
-  network_delegate->set_data_reduction_proxy_auth_request_handler(
-      globals_->data_reduction_proxy_auth_request_handler.get());
-  network_delegate->set_on_resolve_proxy_handler(
-      base::Bind(data_reduction_proxy::OnResolveProxyHandler));
 }
 
 // static