| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
|
| index 3c9ebefd54ba877b608680514af818ae412ae3d6..3298fd42f834c169a298138dbbd23bc7497dec5f 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
|
| @@ -24,6 +24,7 @@
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
|
| #include "net/log/net_log.h"
|
| +#include "net/url_request/url_request_context_getter.h"
|
|
|
| namespace data_reduction_proxy {
|
|
|
| @@ -31,6 +32,7 @@ DataReductionProxyIOData::DataReductionProxyIOData(
|
| const Client& client,
|
| int param_flags,
|
| net::NetLog* net_log,
|
| + net::URLRequestContextGetter* request_context_getter,
|
| scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
|
| bool enable_quic)
|
| @@ -56,12 +58,12 @@ DataReductionProxyIOData::DataReductionProxyIOData(
|
| params.get());
|
| raw_mutable_config = mutable_config.get();
|
| config_.reset(new DataReductionProxyConfig(
|
| - io_task_runner_, ui_task_runner_, net_log, mutable_config.Pass(),
|
| - configurator_.get(), event_store_.get()));
|
| + request_context_getter, io_task_runner_, ui_task_runner_, net_log,
|
| + mutable_config.Pass(), configurator_.get(), event_store_.get()));
|
| } else {
|
| config_.reset(new DataReductionProxyConfig(
|
| - io_task_runner_, ui_task_runner_, net_log, params.Pass(),
|
| - configurator_.get(), event_store_.get()));
|
| + request_context_getter, io_task_runner_, ui_task_runner_, net_log,
|
| + params.Pass(), configurator_.get(), event_store_.get()));
|
| }
|
|
|
| // It is safe to use base::Unretained here, since it gets executed
|
| @@ -106,7 +108,6 @@ void DataReductionProxyIOData::ShutdownOnUIThread() {
|
| void DataReductionProxyIOData::SetDataReductionProxyService(
|
| base::WeakPtr<DataReductionProxyService> data_reduction_proxy_service) {
|
| service_ = data_reduction_proxy_service;
|
| - config()->SetDataReductionProxyService(data_reduction_proxy_service);
|
| }
|
|
|
| bool DataReductionProxyIOData::IsEnabled() const {
|
|
|