Revert of DataReductionProxyStatisticsPrefs should support WeakPtr

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 984ba2eda96f64579d792584adfad99a16d1212e..f20bd9ce62cf1b5da6b28a95097263d501323401 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -125,6 +125,8 @@
   // context->data_reduction_proxy_io_data() is valid.
   DCHECK(context->GetDataReductionProxyIOData());
   context->CreateDataReductionProxyStatisticsIfNecessary();
+  proxy_settings->SetDataReductionProxyStatisticsPrefs(
+      context->GetDataReductionProxyIOData()->statistics_prefs());
   proxy_settings->SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
 }
 
@@ -165,7 +167,8 @@
   data_reduction_proxy_io_data_.reset(
       new data_reduction_proxy::DataReductionProxyIOData(
           data_reduction_proxy::Client::WEBVIEW_ANDROID,
-          scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>(),
+          scoped_ptr<
+              data_reduction_proxy::DataReductionProxyStatisticsPrefs>(),
           data_reduction_proxy_settings_.get(),
           url_request_context_getter_->GetNetLog(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
@@ -276,7 +279,6 @@
   if (data_reduction_proxy_settings_) {
     data_reduction_proxy_settings_->InitDataReductionProxySettings(
         user_pref_service_.get(),
-        scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>(),
         GetRequestContext(),
         GetAwURLRequestContext()->GetNetLog(),
         data_reduction_proxy_io_data_->event_store());
@@ -373,17 +375,13 @@
 
 void AwBrowserContext::CreateDataReductionProxyStatisticsIfNecessary() {
   DCHECK(user_pref_service_.get());
-  DCHECK(GetDataReductionProxySettings());
-  if (GetDataReductionProxySettings()->statistics_prefs())
+  DCHECK(GetDataReductionProxyIOData());
+  if (GetDataReductionProxyIOData()->statistics_prefs())
     return;
   // We don't care about commit_delay for now. It is just a dummy value.
   base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60);
-  GetDataReductionProxySettings()->EnableCompressionStatisticsLogging(
-      user_pref_service_.get(),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
-      commit_delay);
-  GetDataReductionProxyIOData()->SetDataReductionProxyStatisticsPrefs(
-      GetDataReductionProxySettings()->statistics_prefs());
+  GetDataReductionProxyIOData()->EnableCompressionStatisticsLogging(
+      user_pref_service_.get(), commit_delay);
 }
 
 }  // namespace android_webview