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

Unified Diff: net/proxy/proxy_service.h

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.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 9fdcb5815c0250e771d4f1f43d9c2ece931c25cf..91d36843f04781a3ce712a56b747269f99aefa7f 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -122,13 +122,14 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// 3. named proxy
//
// Profiling information for the request is saved to |net_log| if non-NULL.
- int ResolveProxy(const GURL& url,
- int load_flags,
- ProxyInfo* results,
- const net::CompletionCallback& callback,
- PacRequest** pac_request,
- NetworkDelegate* network_delegate,
- const BoundNetLog& net_log);
+ // This method is virtual for unit testing.
eroman 2014/09/23 20:50:42 Can your tests can instead use: ProxyService::Crea
bemasc 2014/09/24 18:34:37 Done.
+ virtual int ResolveProxy(const GURL& url,
+ int load_flags,
+ ProxyInfo* results,
+ const net::CompletionCallback& callback,
+ PacRequest** pac_request,
+ NetworkDelegate* network_delegate,
+ const BoundNetLog& net_log);
// This method is called after a failure to connect or resolve a host name.
// It gives the proxy service an opportunity to reconsider the proxy to use.

Powered by Google App Engine
This is Rietveld 408576698