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

Unified Diff: net/proxy/proxy_service.cc

Issue 545633002: Don't preresolve DNS if a fixed proxy configuration is in place. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo no-longer-needed virtual marking Created 6 years, 3 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: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 4c59024746da2662e643bf8f4568d0c9a124d645..cbb0c6a627b6aee11c8891d35f5f952e785d026b 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -980,7 +980,6 @@ int ProxyService::ResolveProxy(const GURL& raw_url,
NetworkDelegate* network_delegate,
const BoundNetLog& net_log) {
DCHECK(CalledOnValidThread());
- DCHECK(!callback.is_null());
net_log.BeginEvent(NetLog::TYPE_PROXY_SERVICE);
@@ -1005,6 +1004,9 @@ int ProxyService::ResolveProxy(const GURL& raw_url,
return DidFinishResolvingProxy(url, load_flags, network_delegate,
result, rv, net_log);
+ if (callback.is_null())
+ return ERR_IO_PENDING;
eroman 2014/09/23 20:50:42 This calling contract is confusing, since the requ
bemasc 2014/09/24 18:34:37 Done.
+
scoped_refptr<PacRequest> req(
new PacRequest(this, url, load_flags, network_delegate,
result, callback, net_log));

Powered by Google App Engine
This is Rietveld 408576698