net/proxy/proxy_service.cc - Issue 449973002: Use data reduction proxy when managed proxy config returns direct

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: net/proxy/proxy_service.cc

Issue 449973002: Use data reduction proxy when managed proxy config returns direct (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-uma-in-proxy-service

Patch Set: Created 6 years, 4 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

« chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc ('K') | « net/base/network_delegate.cc ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/proxy/proxy_service.cc

diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc

index a11acd82b6cb7bba330bc68bb1eb2497a9edc323..03954d27f902d9bfba112939bb1cd137167bb35c 100644

--- a/net/proxy/proxy_service.cc

+++ b/net/proxy/proxy_service.cc

@@ -1297,7 +1297,7 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url,

// Allow the network delegate to interpose on the resolution decision,

// possibly modifying the ProxyInfo.

if (network_delegate)

- network_delegate->NotifyResolveProxy(url, load_flags, result);

+ network_delegate->NotifyResolveProxy(url, load_flags, this, result);

// When logging all events is enabled, dump the proxy list.

if (net_log.IsLogging()) {

@@ -1324,7 +1324,7 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url,

// Allow the network delegate to interpose on the resolution decision,

// possibly modifying the ProxyInfo.

if (network_delegate)

- network_delegate->NotifyResolveProxy(url, load_flags, result);

+ network_delegate->NotifyResolveProxy(url, load_flags, this, result);

} else {

result_code = ERR_MANDATORY_PROXY_CONFIGURATION_FAILED;

}