Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc |
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc |
index ce1f7c96096ffd7cfbd2c5fd8857c227b0b4cf9e..4f648d1ba0c3c3c644325f677a6ecfba8e51c65c 100644 |
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc |
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc |
@@ -51,9 +51,8 @@ void MigrateDataReductionProxyOffProxyPrefs(PrefService* prefs) { |
dict->SetString("bypass_list", ""); |
} |
-DataReductionProxyChromeSettings::DataReductionProxyChromeSettings( |
- scoped_ptr<DataReductionProxyParams> params) |
- : DataReductionProxySettings(params.Pass()) { |
+DataReductionProxyChromeSettings::DataReductionProxyChromeSettings() |
+ : DataReductionProxySettings() { |
} |
DataReductionProxyChromeSettings::~DataReductionProxyChromeSettings() { |
@@ -62,13 +61,10 @@ 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(), |
bengr
2015/02/03 21:51:57
Why not just pass in io_data? Then you wouldn't ne
jeremyim
2015/02/04 01:31:20
Done.
|
io_data->event_store()); |
DataReductionProxySettings::SetOnDataReductionEnabledCallback( |
base::Bind(&DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial, |