components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc - Issue 653313003: Check effective proxy config before adding data reduction proxies

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 653313003: Check effective proxy config before adding data reduction proxies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments Created 6 years, 2 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

« components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h ('K') | « components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol_unittest.cc » ('j') | components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b5212813b1f4389272ccb0cf4b5725b897ed7baf..56bf99500c8c5f1f6c4d02afa8b38c506e240c70 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

@@ -140,11 +140,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)) {

net::ProxyInfo data_reduction_proxy_info;

data_reduction_proxy_config.proxy_rules().Apply(

url, &data_reduction_proxy_info);