DataReductionProxyStatisticsPrefs should support WeakPtr

components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
index 71d206e262ac18329d6267a954c12ac4d94040d7..22e656276276f6e84024ac5ac4db5df17835825f 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
@@ -25,13 +25,11 @@ namespace data_reduction_proxy {
 
 DataReductionProxyIOData::DataReductionProxyIOData(
     const Client& client,
-    scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs,
     DataReductionProxySettings* settings,
     net::NetLog* net_log,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : client_(client),
-      statistics_prefs_(statistics_prefs.Pass()),
       settings_(settings),
       net_log_(net_log),
       io_task_runner_(io_task_runner),
@@ -41,6 +39,8 @@ DataReductionProxyIOData::DataReductionProxyIOData(
   DCHECK(net_log);
   DCHECK(io_task_runner_.get());
   DCHECK(ui_task_runner_.get());
+  if (settings->statistics_prefs())
+    statistics_prefs_ = settings->statistics_prefs()->GetWeakPtr();

[bengr, 2015/02/03 23:51:17]

#include "...statistics_prefs.h"

[megjablon, 2015/02/04 18:47:54]

Don't need anymore.

   params_ = settings->params()->Clone();
   auth_request_handler_.reset(new DataReductionProxyAuthRequestHandler(
       client_, params_.get(), io_task_runner_));
@@ -62,7 +62,7 @@ void DataReductionProxyIOData::InitOnUIThread(PrefService* pref_service) {
   enabled_.MoveToThread(io_task_runner_);
 }
 
-void  DataReductionProxyIOData::ShutdownOnUIThread() {
+void DataReductionProxyIOData::ShutdownOnUIThread() {
   DCHECK(!shutdown_on_ui_);
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   if (statistics_prefs_) {
@@ -91,9 +91,11 @@ void DataReductionProxyIOData::EnableCompressionStatisticsLogging(
     PrefService* prefs,
     const base::TimeDelta& commit_delay) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
-  statistics_prefs_.reset(
-      new DataReductionProxyStatisticsPrefs(
-          prefs, ui_task_runner_, commit_delay));
+  settings_->SetDataReductionProxyStatisticsPrefs(

[bengr, 2015/02/03 23:51:17]

This shouldn't be in IOData.

[bengr, 2015/02/04 00:06:04]

You can pass one into settings via InitDataReductionProxySettings, and you can
pass a WeakPtr to IOData in the implementation of that method too.

+      scoped_ptr<DataReductionProxyStatisticsPrefs>(
+          new DataReductionProxyStatisticsPrefs(
+              prefs, ui_task_runner_,commit_delay)));
+  statistics_prefs_ = settings_->statistics_prefs()->GetWeakPtr();
 }
 
 scoped_ptr<DataReductionProxyNetworkDelegate>
@@ -106,11 +108,10 @@ DataReductionProxyIOData::CreateNetworkDelegate(
           wrapped_network_delegate.Pass(), params_.get(),
           auth_request_handler_.get(), configurator_.get()));
   if (track_proxy_bypass_statistics && !usage_stats_) {
-    usage_stats_.reset(
-        new data_reduction_proxy::DataReductionProxyUsageStats(
+    usage_stats_.reset(new data_reduction_proxy::DataReductionProxyUsageStats(
         params_.get(), settings_, ui_task_runner_));
     network_delegate->InitStatisticsPrefsAndUMA(
-        ui_task_runner_, statistics_prefs_.get(), &enabled_,
+        ui_task_runner_, statistics_prefs_, &enabled_,
         usage_stats_.get());
   }
   return network_delegate.Pass();