Data Reduction Proxy class ownership updates and Settings cleanup

android_webview/browser/aw_browser_context.cc

Index: android_webview/browser/aw_browser_context.cc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index f20bd9ce62cf1b5da6b28a95097263d501323401..45f8f079cf53453d09e79213fdf103c75b5412f2 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -21,6 +21,7 @@
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
@@ -159,11 +160,7 @@ void AwBrowserContext::PreMainMessageLoopRun() {
           make_scoped_ptr(CreateProxyConfigService()).Pass());
 
   data_reduction_proxy_settings_.reset(
-      new data_reduction_proxy::DataReductionProxySettings(
-          scoped_ptr<data_reduction_proxy::DataReductionProxyParams>(
-              new data_reduction_proxy::DataReductionProxyParams(
-                  data_reduction_proxy::DataReductionProxyParams::kAllowed))
-              .Pass()));
+      new data_reduction_proxy::DataReductionProxySettings());
   data_reduction_proxy_io_data_.reset(
       new data_reduction_proxy::DataReductionProxyIOData(
           data_reduction_proxy::Client::WEBVIEW_ANDROID,
@@ -174,8 +171,6 @@ void AwBrowserContext::PreMainMessageLoopRun() {
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
           BrowserThread::GetMessageLoopProxyForThread(
               BrowserThread::UI)));
-  data_reduction_proxy_settings_->SetProxyConfigurator(
-      data_reduction_proxy_io_data_->configurator());
 
   visitedlink_master_.reset(
       new visitedlink::VisitedLinkMaster(this, this, false));
@@ -279,8 +274,7 @@ void AwBrowserContext::CreateUserPrefServiceIfNecessary() {
   if (data_reduction_proxy_settings_) {
     data_reduction_proxy_settings_->InitDataReductionProxySettings(
         user_pref_service_.get(),
-        GetRequestContext(),
-        GetAwURLRequestContext()->GetNetLog(),
+        data_reduction_proxy_io_data_->config(),
         data_reduction_proxy_io_data_->event_store());
     data_reduction_proxy_settings_->MaybeActivateDataReductionProxy(true);