Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc |
index 967c897daddf2f9c8e6785ac329d2e44310fa976..d69691e3aa5f6fced9df96f93dbc2557e8009ca4 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc |
@@ -130,11 +130,13 @@ bool MaybeBypassProxyAndPrepareToRetry( |
void OnResolveProxyHandler(const GURL& url, |
int load_flags, |
const net::ProxyConfig& data_reduction_proxy_config, |
+ const net::ProxyConfig& proxy_service_proxy_config, |
const net::ProxyRetryInfoMap& proxy_retry_info, |
const DataReductionProxyParams* params, |
net::ProxyInfo* result) { |
if (data_reduction_proxy_config.is_valid() && |
- result->proxy_server().is_direct()) { |
+ result->proxy_server().is_direct() && |
+ !data_reduction_proxy_config.Equals(proxy_service_proxy_config)) { |
mef
2014/10/28 17:01:32
I'm not sure I understand why we need this check.
bengr
2014/10/29 21:12:37
The point of this code is to add the data reductio
|
net::ProxyInfo data_reduction_proxy_info; |
data_reduction_proxy_config.proxy_rules().Apply( |
url, &data_reduction_proxy_info); |