| Index: net/proxy/proxy_service.h
|
| diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
|
| index 0e011c5963de894e354c133d9bd79f7e5b59433f..41eabb33c2160148519d8de4a2949b8e50906f38 100644
|
| --- a/net/proxy/proxy_service.h
|
| +++ b/net/proxy/proxy_service.h
|
| @@ -76,11 +76,6 @@ 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,
|
| ProxyInfo* results,
|
| - OldCompletionCallback* callback,
|
| - PacRequest** pac_request,
|
| - const BoundNetLog& net_log);
|
| - int ResolveProxy(const GURL& url,
|
| - ProxyInfo* results,
|
| const net::CompletionCallback& callback,
|
| PacRequest** pac_request,
|
| const BoundNetLog& net_log);
|
| @@ -347,9 +342,6 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
|
| // no need for DHCP PAC script fetching.
|
| scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher_;
|
|
|
| - // Callback for when |init_proxy_resolver_| is done.
|
| - OldCompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
|
| -
|
| // Helper to download the PAC script (wpad + custom) and apply fallback rules.
|
| //
|
| // Note that the declaration is important here: |proxy_script_fetcher_| and
|
|
|