Data Reduction Proxy class ownership updates and Settings cleanup

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

 // Copyright 2014 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 "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
+#include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.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 "net/url_request/url_request_context_getter.h"
 
 using data_reduction_proxy::Client;
 using data_reduction_proxy::DataReductionProxyParams;
 using data_reduction_proxy::DataReductionProxySettings;
 
 // The Data Reduction Proxy has been turned into a "best effort" proxy,
@@ skipping 30 matching lines @@
     return;
   net::ProxyConfig::ProxyRules proxy_rules;
   proxy_rules.ParseFromString(proxy_server);
   if (!data_reduction_proxy::DataReductionProxyConfigurator::
           ContainsDataReductionProxy(proxy_rules)) {
     return;
   }
   prefs->ClearPref(prefs::kProxy);
 }
 
-DataReductionProxyChromeSettings::DataReductionProxyChromeSettings(
-    scoped_ptr<DataReductionProxyParams> params)
-    : DataReductionProxySettings(params.Pass()) {
+DataReductionProxyChromeSettings::DataReductionProxyChromeSettings()
+    : DataReductionProxySettings() {
 }
 
 DataReductionProxyChromeSettings::~DataReductionProxyChromeSettings() {
 }
 
+void DataReductionProxyChromeSettings::Shutdown() {
+  data_reduction_proxy_service()->Shutdown();
+}
+
 void DataReductionProxyChromeSettings::InitDataReductionProxySettings(
     data_reduction_proxy::DataReductionProxyIOData* io_data,
     PrefService* profile_prefs,
-    PrefService* local_state_prefs,
-    net::URLRequestContextGetter* request_context,
-    bool enable_quic) {
-  SetProxyConfigurator(io_data->configurator());
+    net::URLRequestContextGetter* request_context_getter,
+    const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) {
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  // On mobile we write Data Reduction Proxy prefs directly to the pref service.
+  // On desktop we store Data Reduction Proxy prefs in memory, writing to disk
+  // every 60 minutes and on termination. Shutdown hooks must be added for
+  // Android and iOS in order for non-zero delays to be supported.
+  // (http://crbug.com/408264)
+  base::TimeDelta commit_delay = base::TimeDelta();
+#else
+  base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60);
+#endif
+
+  scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
+      statistics_prefs = make_scoped_ptr(
+          new data_reduction_proxy::DataReductionProxyStatisticsPrefs(
+              profile_prefs, ui_task_runner, commit_delay));
+  scoped_ptr<data_reduction_proxy::DataReductionProxyService>
+      service = make_scoped_ptr(
+          new data_reduction_proxy::DataReductionProxyService(
+              statistics_prefs.Pass(), this, request_context_getter));
   DataReductionProxySettings::InitDataReductionProxySettings(
-      profile_prefs,
-      io_data->PassStatisticsPrefs(),
-      request_context,
-      io_data->net_log(),
-      io_data->event_store(),
-      enable_quic);
+      profile_prefs, io_data, service.Pass());
+  io_data->SetDataReductionProxyService(
+      data_reduction_proxy_service()->GetWeakPtr());
+
   DataReductionProxySettings::SetOnDataReductionEnabledCallback(
       base::Bind(&DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial,
                  base::Unretained(this)));
   SetDataReductionProxyAlternativeEnabled(
       DataReductionProxyParams::IsIncludedInAlternativeFieldTrial());
   // TODO(bengr): Remove after M46. See http://crbug.com/445599.
   MigrateDataReductionProxyOffProxyPrefs(profile_prefs);
 }
 
 void DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial(
@@ skipping 22 matching lines @@
 #elif defined(OS_OPENBSD)
   return Client::CHROME_OPENBSD;
 #elif defined(OS_SOLARIS)
   return Client::CHROME_SOLARIS;
 #elif defined(OS_QNX)
   return Client::CHROME_QNX;
 #else
   return Client::UNKNOWN;
 #endif
 }