| 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 37ecf9678b17a8f8b531f52ae2d669d8b6b31229..acefe1a5e5285d1aa88c095a035a4e38a2f1878a 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
|
| @@ -138,7 +138,7 @@ DataReductionProxyIOData::DataReductionProxyIOData(
|
| if (use_config_client) {
|
| config_client_.reset(new DataReductionProxyConfigServiceClient(
|
| params.Pass(), GetBackoffPolicy(), request_options_.get(),
|
| - raw_mutable_config, config_.get()));
|
| + raw_mutable_config, config_.get(), event_creator_.get(), net_log_));
|
| }
|
|
|
| proxy_delegate_.reset(
|
| @@ -234,32 +234,39 @@ void DataReductionProxyIOData::UpdateContentLengths(
|
| data_reduction_proxy_enabled, request_type));
|
| }
|
|
|
| -void DataReductionProxyIOData::AddEnabledEvent(scoped_ptr<base::Value> entry,
|
| +void DataReductionProxyIOData::AddEvent(scoped_ptr<base::Value> event) {
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| + ui_task_runner_->PostTask(
|
| + FROM_HERE, base::Bind(&DataReductionProxyService::AddEvent, service_,
|
| + base::Passed(&event)));
|
| +}
|
| +
|
| +void DataReductionProxyIOData::AddEnabledEvent(scoped_ptr<base::Value> event,
|
| bool enabled) {
|
| DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| ui_task_runner_->PostTask(
|
| FROM_HERE, base::Bind(&DataReductionProxyService::AddEnabledEvent,
|
| - service_, base::Passed(&entry), enabled));
|
| + service_, base::Passed(&event), enabled));
|
| }
|
|
|
| void DataReductionProxyIOData::AddEventAndSecureProxyCheckState(
|
| - scoped_ptr<base::Value> entry,
|
| + scoped_ptr<base::Value> event,
|
| SecureProxyCheckState state) {
|
| DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&DataReductionProxyService::AddEventAndSecureProxyCheckState,
|
| - service_, base::Passed(&entry), state));
|
| + service_, base::Passed(&event), state));
|
| }
|
|
|
| void DataReductionProxyIOData::AddAndSetLastBypassEvent(
|
| - scoped_ptr<base::Value> entry,
|
| + scoped_ptr<base::Value> event,
|
| int64 expiration_ticks) {
|
| DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&DataReductionProxyService::AddAndSetLastBypassEvent, service_,
|
| - base::Passed(&entry), expiration_ticks));
|
| + base::Passed(&event), expiration_ticks));
|
| }
|
|
|
| void DataReductionProxyIOData::SetUnreachable(bool unreachable) {
|
|
|