| 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 73339148aaee843cd9d7c09d5070cf3e30e0bb41..4dcb4e223ff0b42de2bf3e7e47f2a699807733de 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
|
| @@ -161,10 +161,8 @@ TestDataReductionProxyConfigServiceClient::TestBackoffEntry::ImplGetTimeNow()
|
|
|
| MockDataReductionProxyService::MockDataReductionProxyService(
|
| scoped_ptr<DataReductionProxyCompressionStats> compression_stats,
|
| - DataReductionProxySettings* settings,
|
| - net::URLRequestContextGetter* request_context)
|
| - : DataReductionProxyService(
|
| - compression_stats.Pass(), settings, request_context) {
|
| + DataReductionProxySettings* settings)
|
| + : DataReductionProxyService(compression_stats.Pass(), settings) {
|
| }
|
|
|
| MockDataReductionProxyService::~MockDataReductionProxyService() {
|
| @@ -338,17 +336,17 @@ DataReductionProxyTestContext::Builder::Build() {
|
| params.get());
|
| raw_mutable_config = mutable_config.get();
|
| config.reset(new TestDataReductionProxyConfig(
|
| - mutable_config.Pass(), task_runner, net_log.get(), configurator.get(),
|
| - event_store.get()));
|
| + request_context_getter.get(), mutable_config.Pass(), task_runner,
|
| + net_log.get(), configurator.get(), event_store.get()));
|
| } else if (use_mock_config_) {
|
| test_context_flags |= USE_MOCK_CONFIG;
|
| config.reset(new MockDataReductionProxyConfig(
|
| - params.Pass(), task_runner, net_log.get(), configurator.get(),
|
| - event_store.get()));
|
| + params.Pass(), task_runner, request_context_getter.get(), net_log.get(),
|
| + configurator.get(), event_store.get()));
|
| } else {
|
| config.reset(new TestDataReductionProxyConfig(
|
| - params.Pass(), task_runner, net_log.get(), configurator.get(),
|
| - event_store.get()));
|
| + request_context_getter.get(), params.Pass(), task_runner, net_log.get(),
|
| + configurator.get(), event_store.get()));
|
| }
|
|
|
| scoped_ptr<DataReductionProxyRequestOptions> request_options;
|
| @@ -459,12 +457,10 @@ DataReductionProxyTestContext::CreateDataReductionProxyServiceInternal() {
|
|
|
| if (test_context_flags_ & DataReductionProxyTestContext::USE_MOCK_SERVICE) {
|
| return make_scoped_ptr(new MockDataReductionProxyService(
|
| - compression_stats.Pass(), settings_.get(),
|
| - request_context_getter_.get()));
|
| + compression_stats.Pass(), settings_.get()));
|
| } else {
|
| - return make_scoped_ptr(
|
| - new DataReductionProxyService(compression_stats.Pass(), settings_.get(),
|
| - request_context_getter_.get()));
|
| + return make_scoped_ptr(new DataReductionProxyService(
|
| + compression_stats.Pass(), settings_.get()));
|
| }
|
| }
|
|
|
|
|