Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc |
index 4009c211e909a7e23f5764ca9f420c1391e632b3..7c504aed9512736a3eb79ef6714836f367d5009a 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc |
@@ -68,6 +68,10 @@ void DataReductionProxyConfigurator::Enable( |
data_reduction_proxy_event_store_->AddProxyEnabledEvent( |
net_log_, primary_restricted, fallback_restricted, primary_origin, |
fallback_origin, ssl_origin); |
+ if (network_task_runner_->RunsTasksOnCurrentThread()) { |
+ UpdateProxyConfigOnIOThread(config); |
+ return; |
+ } |
network_task_runner_->PostTask( |
FROM_HERE, |
base::Bind( |
@@ -79,6 +83,11 @@ void DataReductionProxyConfigurator::Enable( |
void DataReductionProxyConfigurator::Disable() { |
net::ProxyConfig config = net::ProxyConfig::CreateDirect(); |
data_reduction_proxy_event_store_->AddProxyDisabledEvent(net_log_); |
+ |
+ if (network_task_runner_->RunsTasksOnCurrentThread()) { |
+ UpdateProxyConfigOnIOThread(config); |
+ return; |
+ } |
network_task_runner_->PostTask( |
FROM_HERE, |
base::Bind( |