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

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 451725252ca0d3d7edeae6912fec753348f5e8ee..7cd737ccc038d316e2e41c116e14377015c2248d 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -24,6 +24,7 @@
 #include "chrome/browser/profiles/storage_partition_descriptor.h"
 #include "components/content_settings/core/common/content_settings_types.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_network_delegate.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
@@ -451,7 +452,12 @@ class ProfileIOData {
         data_reduction_proxy_event_store.Pass();
   }
 
-  ChromeNetworkDelegate* network_delegate() const {
+  void set_network_delegate(
+      scoped_ptr<net::NetworkDelegate> network_delegate) const {
+    network_delegate_ = network_delegate.Pass();
+  }
+
+  net::NetworkDelegate* network_delegate() const {

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

Think we can get rid of this - can just grab it from the appropriate context, or
off the stack, where it's needed, I believe.

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

Done.

     return network_delegate_.get();
   }
 
@@ -534,6 +540,7 @@ class ProfileIOData {
   // Does the actual initialization of the ProfileIOData subtype. Subtypes
   // should use the static helper functions above to implement this.
   virtual void InitializeInternal(
+      scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate,
       ProfileParams* profile_params,
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector
@@ -662,7 +669,7 @@ class ProfileIOData {
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
       data_reduction_proxy_usage_stats_;
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
-            data_reduction_proxy_statistics_prefs_;
+      data_reduction_proxy_statistics_prefs_;
   mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_;
   mutable scoped_ptr<DataReductionProxyChromeConfigurator>
       data_reduction_proxy_chrome_configurator_;
@@ -671,7 +678,7 @@ class ProfileIOData {
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
       data_reduction_proxy_event_store_;
 
-  mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
+  mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;