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

android_webview/browser/net/aw_url_request_context_getter.cc

Index: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 1c74bd042000c70c070b1f2e3e60299affa8b5e0..05294ac855adb2cafa37b93dba38983eaabd9132 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -20,6 +20,7 @@
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ -195,8 +196,12 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
 
   net::URLRequestContextBuilder builder;
   builder.set_user_agent(GetUserAgent());
-  AwNetworkDelegate* aw_network_delegate = new AwNetworkDelegate();
-  builder.set_network_delegate(aw_network_delegate);
+  scoped_ptr<AwNetworkDelegate> aw_network_delegate(new AwNetworkDelegate());
+  data_reduction_proxy::DataReductionProxyNetworkDelegate*
+      data_reduction_proxy_network_delegate =
+          new data_reduction_proxy::DataReductionProxyNetworkDelegate(
+              aw_network_delegate.Pass());
+  builder.set_network_delegate(data_reduction_proxy_network_delegate);
 #if !defined(DISABLE_FTP_SUPPORT)
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.
 #endif
@@ -244,10 +249,11 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   // Compression statistics are not gathered for WebView, so
   // DataReductionProxyStatisticsPrefs is not instantiated and passed to the
   // network delegate.
-  aw_network_delegate->set_data_reduction_proxy_params(
+  data_reduction_proxy_network_delegate->set_data_reduction_proxy_params(
       data_reduction_proxy_settings->params());

[bengr, 2014/11/18 19:30:55]

Make this part of the  DRPNetworkDelegate constructor or put inside a
DRPNetworkDelegate::Init(). Ideally, the embedder wouldn't need to think about
these added hookups.

[megjablon, 2014/11/19 19:23:40]

Done.

-  aw_network_delegate->set_data_reduction_proxy_auth_request_handler(
-      data_reduction_proxy_auth_request_handler_.get());
+  data_reduction_proxy_network_delegate->
+      set_data_reduction_proxy_auth_request_handler(
+          data_reduction_proxy_auth_request_handler_.get());
 
   main_http_factory_.reset(main_cache);
   url_request_context_->set_http_transaction_factory(main_cache);