| 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 b7207c2a7b6d006d2971ea321403da2a9a79b614..70d4502c589523881021c875085a8813ea2ab886 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
|
| @@ -83,21 +83,21 @@ BasicHTTPURLRequestContextGetter::GetURLRequestContext() {
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner>
|
| BasicHTTPURLRequestContextGetter::GetNetworkTaskRunner() const {
|
| return network_task_runner_;
|
| }
|
|
|
| BasicHTTPURLRequestContextGetter::~BasicHTTPURLRequestContextGetter() {
|
| }
|
|
|
| DataReductionProxyIOData::DataReductionProxyIOData(
|
| - const Client& client,
|
| + Client client,
|
| int param_flags,
|
| net::NetLog* net_log,
|
| scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
|
| bool enabled,
|
| const std::string& user_agent)
|
| : client_(client),
|
| net_log_(net_log),
|
| io_task_runner_(io_task_runner),
|
| ui_task_runner_(ui_task_runner),
|
| @@ -108,21 +108,21 @@ DataReductionProxyIOData::DataReductionProxyIOData(
|
| weak_factory_(this) {
|
| DCHECK(net_log);
|
| DCHECK(io_task_runner_);
|
| DCHECK(ui_task_runner_);
|
| std::unique_ptr<DataReductionProxyParams> params(
|
| new DataReductionProxyParams(param_flags));
|
| event_creator_.reset(new DataReductionProxyEventCreator(this));
|
| configurator_.reset(
|
| new DataReductionProxyConfigurator(net_log, event_creator_.get()));
|
| bool use_config_client =
|
| - params::IsConfigClientEnabled() && client_ != CRONET_ANDROID;
|
| + params::IsConfigClientEnabled() && client_ != Client::CRONET_ANDROID;
|
| DataReductionProxyMutableConfigValues* raw_mutable_config = nullptr;
|
| if (use_config_client) {
|
| std::unique_ptr<DataReductionProxyMutableConfigValues> mutable_config =
|
| DataReductionProxyMutableConfigValues::CreateFromParams(params.get());
|
| raw_mutable_config = mutable_config.get();
|
| config_.reset(new DataReductionProxyConfig(
|
| io_task_runner, net_log, std::move(mutable_config), configurator_.get(),
|
| event_creator_.get()));
|
| } else {
|
| config_.reset(new DataReductionProxyConfig(
|
|
|