| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc
|
| index fd41eda777ca15f847b0bc53d232c86141b59ac3..7404c0b5b4435e40de2db740770fda0988c9ef4e 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc
|
| @@ -26,10 +26,9 @@ namespace data_reduction_proxy {
|
|
|
| MockDataReductionProxyService::MockDataReductionProxyService(
|
| scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs,
|
| - DataReductionProxySettings* settings,
|
| - net::URLRequestContextGetter* request_context)
|
| + DataReductionProxySettings* settings)
|
| : DataReductionProxyService(
|
| - statistics_prefs.Pass(), settings, request_context) {
|
| + statistics_prefs.Pass(), settings) {
|
| }
|
|
|
| MockDataReductionProxyService::~MockDataReductionProxyService() {
|
| @@ -165,11 +164,13 @@ DataReductionProxyTestContext::Builder::Build() {
|
| if (use_mock_config_) {
|
| test_context_flags |= USE_MOCK_CONFIG;
|
| config.reset(new MockDataReductionProxyConfig(
|
| - params_flags_, params_definitions_, task_runner, net_log.get(),
|
| - configurator.get(), event_store.get()));
|
| + params_flags_, params_definitions_, task_runner,
|
| + request_context_getter, net_log.get(), configurator.get(),
|
| + event_store.get()));
|
| } else {
|
| config.reset(new TestDataReductionProxyConfig(
|
| - params_flags_, params_definitions_, task_runner, net_log.get(),
|
| + params_flags_, params_definitions_, task_runner,
|
| + request_context_getter.get(), net_log.get(),
|
| configurator.get(), event_store.get()));
|
| }
|
|
|
| @@ -261,12 +262,11 @@ DataReductionProxyTestContext::CreateDataReductionProxyServiceInternal() {
|
|
|
| if (test_context_flags_ & DataReductionProxyTestContext::USE_MOCK_SERVICE) {
|
| return make_scoped_ptr(new MockDataReductionProxyService(
|
| - statistics_prefs.Pass(), settings_.get(),
|
| - request_context_getter_.get()));
|
| + statistics_prefs.Pass(), settings_.get()));
|
| } else {
|
| return make_scoped_ptr(
|
| - new DataReductionProxyService(statistics_prefs.Pass(), settings_.get(),
|
| - request_context_getter_.get()));
|
| + new DataReductionProxyService(statistics_prefs.Pass(),
|
| + settings_.get()));
|
| }
|
| }
|
|
|
|
|