Index: net/proxy/proxy_service.h |
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h |
index b6ef447d43b22eaa5a6e99971b9776cf4fde580a..3f81ed745ddd8cf6f124f309c66432230f51e4d8 100644 |
--- a/net/proxy/proxy_service.h |
+++ b/net/proxy/proxy_service.h |
@@ -124,9 +124,11 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver, |
// |
// 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 called after a failure to connect or resolve a host name. |
@@ -351,7 +353,9 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver, |
// Returns ERR_IO_PENDING if the request cannot be completed synchronously. |
// Otherwise it fills |result| with the proxy information for |url|. |
// Completing synchronously means we don't need to query ProxyResolver. |
- int TryToCompleteSynchronously(const GURL& url, ProxyInfo* result); |
+ int TryToCompleteSynchronously(const GURL& url, int load_flags, |
+ NetworkDelegate* network_delegate, |
+ ProxyInfo* result); |
// Cancels all of the requests sent to the ProxyResolver. These will be |
// restarted when calling SetReady(). |