Data Reduction Proxy class ownership updates and Settings cleanup

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 00f44c574f367c892fe5e13f58f4342cd0ebb1e5..57981141b65afe63ecf92cca5774e8f5454c6f0f 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
@@ -9,11 +9,11 @@
 #include "base/prefs/pref_member.h"
 #include "base/single_thread_task_runner.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
@@ -25,35 +25,31 @@ namespace data_reduction_proxy {
 
 DataReductionProxyIOData::DataReductionProxyIOData(
     const Client& client,
-    scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs,
-    DataReductionProxySettings* settings,
+    int param_flags,
     net::NetLog* net_log,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : client_(client),
-      temporary_statistics_prefs_(statistics_prefs.Pass()),
-      settings_(settings),
       net_log_(net_log),
       io_task_runner_(io_task_runner),
       ui_task_runner_(ui_task_runner),
-      shutdown_on_ui_(false),
-      initialized_(false),
-      network_delegate_created_(false) {
-  DCHECK(settings);
+      shutdown_on_ui_(false) {
   DCHECK(net_log);
   DCHECK(io_task_runner_.get());
   DCHECK(ui_task_runner_.get());
-  params_ = settings->params()->Clone();
+  scoped_ptr<DataReductionProxyParams> params(
+      new DataReductionProxyParams(param_flags));
   request_options_.reset(new DataReductionProxyRequestOptions(
-      client_, params_.get(), io_task_runner_));
+      client_, params.get(), io_task_runner_));
+  request_options_->Init();
   event_store_.reset(new DataReductionProxyEventStore(ui_task_runner));
   configurator_.reset(new DataReductionProxyConfigurator(
       io_task_runner, net_log, event_store_.get()));
   proxy_delegate_.reset(
-      new data_reduction_proxy::DataReductionProxyDelegate(
-          request_options_.get(), params_.get()));
-  if (temporary_statistics_prefs_)
-    statistics_prefs_ = temporary_statistics_prefs_->GetWeakPtr();
+      new DataReductionProxyDelegate(request_options_.get(), params.get()));
+  config_.reset(new DataReductionProxyConfig(
+      io_task_runner_, ui_task_runner_, net_log, params.Pass(),
+      configurator_.get(), event_store_.get()));
 }
 
 DataReductionProxyIOData::DataReductionProxyIOData() : shutdown_on_ui_(false) {
@@ -63,13 +59,6 @@ DataReductionProxyIOData::~DataReductionProxyIOData() {
   DCHECK(shutdown_on_ui_);
 }
 
-void DataReductionProxyIOData::Init() {
-  DCHECK(!initialized_);
-  DCHECK(!network_delegate_created_);
-  initialized_ = true;
-  request_options_->Init();
-}
-
 void DataReductionProxyIOData::InitOnUIThread(PrefService* pref_service) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   enabled_.Init(prefs::kDataReductionProxyEnabled, pref_service);
@@ -83,14 +72,10 @@ void DataReductionProxyIOData::ShutdownOnUIThread() {
   shutdown_on_ui_ = true;
 }
 
-void DataReductionProxyIOData::SetDataReductionProxyStatisticsPrefs(
-    base::WeakPtr<DataReductionProxyStatisticsPrefs> statistics_prefs) {
-  statistics_prefs_ = statistics_prefs;
-}
-
-scoped_ptr<DataReductionProxyStatisticsPrefs>
-DataReductionProxyIOData::PassStatisticsPrefs() {
-  return temporary_statistics_prefs_.Pass();
+void DataReductionProxyIOData::SetDataReductionProxyService(
+    base::WeakPtr<DataReductionProxyService> data_reduction_proxy_service) {
+  service_ = data_reduction_proxy_service;
+  config()->SetDataReductionProxyService(data_reduction_proxy_service);
 }
 
 bool DataReductionProxyIOData::IsEnabled() const {
@@ -104,7 +89,7 @@ scoped_ptr<net::URLRequestInterceptor>
 DataReductionProxyIOData::CreateInterceptor() {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
   return make_scoped_ptr(new DataReductionProxyInterceptor(
-      params_.get(), usage_stats_.get(), event_store_.get()));
+      config_->params(), usage_stats_.get(), event_store_.get()));
 }
 
 scoped_ptr<DataReductionProxyNetworkDelegate>
@@ -114,15 +99,14 @@ DataReductionProxyIOData::CreateNetworkDelegate(
   DCHECK(io_task_runner_->BelongsToCurrentThread());
   scoped_ptr<DataReductionProxyNetworkDelegate> network_delegate(
       new DataReductionProxyNetworkDelegate(
-          wrapped_network_delegate.Pass(), params_.get(),
+          wrapped_network_delegate.Pass(), config_->params(),
           request_options_.get(), configurator_.get()));
   if (track_proxy_bypass_statistics && !usage_stats_) {
     usage_stats_.reset(new data_reduction_proxy::DataReductionProxyUsageStats(
-        params_.get(), settings_, ui_task_runner_));
-    network_delegate->InitStatisticsPrefsAndUMA(
-        ui_task_runner_, statistics_prefs_, &enabled_, usage_stats_.get());
+        config_->params(), service_, ui_task_runner_));
+    network_delegate->InitIODataAndUMA(ui_task_runner_, this, &enabled_,
+                                       usage_stats_.get());
   }
-  network_delegate_created_ = true;
   return network_delegate.Pass();
 }