Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc

Issue 1735203002: Revert of Moving proxy resolution logic out of NetworkDelegate and into ProxyDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8b74b49e1c3783d36de716d879d4c97c5fbb96cc..5a86b16c09e6bcbb5dd14965cc1893fb36e1b177 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
@@ -149,9 +149,8 @@
base::Unretained(this))));
}
- proxy_delegate_.reset(new DataReductionProxyDelegate(
- request_options_.get(), config_.get(), configurator_.get(),
- event_creator_.get(), bypass_stats_.get(), net_log_));
+ proxy_delegate_.reset(
+ new DataReductionProxyDelegate(request_options_.get(), config_.get()));
}
DataReductionProxyIOData::DataReductionProxyIOData()
@@ -222,18 +221,11 @@
scoped_ptr<DataReductionProxyNetworkDelegate> network_delegate(
new DataReductionProxyNetworkDelegate(
std::move(wrapped_network_delegate), config_.get(),
- request_options_.get(), configurator_.get()));
+ request_options_.get(), configurator_.get(), net_log_,
+ event_creator_.get()));
if (track_proxy_bypass_statistics)
network_delegate->InitIODataAndUMA(this, bypass_stats_.get());
return network_delegate;
-}
-
-scoped_ptr<DataReductionProxyDelegate>
-DataReductionProxyIOData::CreateProxyDelegate() const {
- DCHECK(io_task_runner_->BelongsToCurrentThread());
- return make_scoped_ptr(new DataReductionProxyDelegate(
- request_options_.get(), config_.get(), configurator_.get(),
- event_creator_.get(), bypass_stats_.get(), net_log_));
}
// TODO(kundaji): Rename this method to something more descriptive.

Powered by Google App Engine
This is Rietveld 408576698