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

Unified Diff: components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc

Issue 848103002: AreDataReductionProxiesBypassed should use the DRP config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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
« no previous file with comments | « components/data_reduction_proxy/core/common/data_reduction_proxy_params.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
index 04f16b456f88a753578443d020b5b685b353b739..80139f554da1b0deba67964d7b760969cc6cfb18 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
@@ -421,12 +421,14 @@ std::string DataReductionProxyParams::GetDefaultDevFallbackOrigin() const {
}
bool DataReductionProxyParams::AreDataReductionProxiesBypassed(
- const net::URLRequest& request, base::TimeDelta* min_retry_delay) const {
+ const net::URLRequest& request,
+ const net::ProxyConfig& data_reduction_proxy_config,
+ base::TimeDelta* min_retry_delay) const {
if (request.context() != NULL &&
request.context()->proxy_service() != NULL) {
return AreProxiesBypassed(
request.context()->proxy_service()->proxy_retry_info(),
- request.context()->proxy_service()->config().proxy_rules(),
+ data_reduction_proxy_config.proxy_rules(),
request.url().SchemeIs(url::kHttpsScheme),
min_retry_delay);
}
« no previous file with comments | « components/data_reduction_proxy/core/common/data_reduction_proxy_params.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698