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 "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 33 matching lines @@
   proxy_rules.ParseFromString(proxy_server);
   if (!data_reduction_proxy::DataReductionProxyConfigurator::
           ContainsDataReductionProxy(proxy_rules)) {
     return;
   }
   dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
   dict->SetString("server", "");
   dict->SetString("bypass_list", "");
 }
 
-DataReductionProxyChromeSettings::DataReductionProxyChromeSettings(
-    scoped_ptr<DataReductionProxyParams> params)
-    : DataReductionProxySettings(params.Pass()) {
+DataReductionProxyChromeSettings::DataReductionProxyChromeSettings()
+    : DataReductionProxySettings() {
 }
 
 DataReductionProxyChromeSettings::~DataReductionProxyChromeSettings() {
 }
 
 void DataReductionProxyChromeSettings::InitDataReductionProxySettings(
     data_reduction_proxy::DataReductionProxyIOData* io_data,
     PrefService* profile_prefs,
-    PrefService* local_state_prefs,
-    net::URLRequestContextGetter* request_context) {
-  SetProxyConfigurator(io_data->configurator());
+    PrefService* local_state_prefs) {
   DataReductionProxySettings::InitDataReductionProxySettings(
       profile_prefs,
-      request_context,
-      io_data->net_log(),
+      io_data->config(),
       io_data->event_store());
   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);
 }
 
@@ skipping 23 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
 }