Revert of DataReductionProxyStatisticsPrefs should support WeakPtr

android_webview/browser/aw_browser_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_browser_context.h"
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/browser/aw_quota_manager_bridge.h"
 #include "android_webview/browser/aw_resource_context.h"
@@ skipping 107 matching lines @@
   if (context == NULL || context->user_pref_service_.get() == NULL)
     return;
   data_reduction_proxy::DataReductionProxySettings* proxy_settings =
       context->GetDataReductionProxySettings();
   if (proxy_settings == NULL)
     return;
   // At this point, context->PreMainMessageLoopRun() has run, so
   // 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_);
 }
 
 // static
 void AwBrowserContext::SetLegacyCacheRemovalDelayForTest(int delay_ms) {
   legacy_cache_removal_delay_ms_ = delay_ms;
 }
 
 void AwBrowserContext::PreMainMessageLoopRun() {
   cookie_store_ = CreateCookieStore(this);
@@ skipping 20 matching lines @@
 
   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()));
   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),
           BrowserThread::GetMessageLoopProxyForThread(
               BrowserThread::UI)));
   data_reduction_proxy_settings_->SetProxyConfigurator(
       data_reduction_proxy_io_data_->configurator());
 
   visitedlink_master_.reset(
       new visitedlink::VisitedLinkMaster(this, this, false));
@@ skipping 90 matching lines @@
   base::PrefServiceFactory pref_service_factory;
   pref_service_factory.set_user_prefs(make_scoped_refptr(new AwPrefStore()));
   pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
   user_pref_service_ = pref_service_factory.Create(pref_registry).Pass();
 
   user_prefs::UserPrefs::Set(this, user_pref_service_.get());
 
   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());
     data_reduction_proxy_settings_->MaybeActivateDataReductionProxy(true);
 
     SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
   }
 }
 
 scoped_ptr<content::ZoomLevelDelegate>
@@ skipping 76 matching lines @@
 void AwBrowserContext::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
   // can change in the lifetime of this WebView and may not yet be set here.
   // Therefore this initialization path is not used.
   enumerator->OnComplete(true);
 }
 
 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