| Index: net/proxy/dhcp_proxy_script_fetcher_win.h
|
| diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.h b/net/proxy/dhcp_proxy_script_fetcher_win.h
|
| index 0d7dc3ec5297328fed72e5531acbde6060053f66..ce6c7dc98a480d6b8f0239d0339278f1fa57dff4 100644
|
| --- a/net/proxy/dhcp_proxy_script_fetcher_win.h
|
| +++ b/net/proxy/dhcp_proxy_script_fetcher_win.h
|
| @@ -35,7 +35,8 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptFetcherWin
|
| virtual ~DhcpProxyScriptFetcherWin();
|
|
|
| // DhcpProxyScriptFetcher implementation.
|
| - int Fetch(string16* utf16_text, OldCompletionCallback* callback) OVERRIDE;
|
| + int Fetch(string16* utf16_text,
|
| + const net::CompletionCallback& callback) OVERRIDE;
|
| void Cancel() OVERRIDE;
|
| const GURL& GetPacURL() const OVERRIDE;
|
| std::string GetFetcherName() const OVERRIDE;
|
| @@ -138,14 +139,11 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptFetcherWin
|
| typedef ScopedVector<DhcpProxyScriptAdapterFetcher> FetcherVector;
|
| FetcherVector fetchers_;
|
|
|
| - // Callback invoked when any fetcher completes.
|
| - OldCompletionCallbackImpl<DhcpProxyScriptFetcherWin> fetcher_callback_;
|
| -
|
| // Number of fetchers we are waiting for.
|
| int num_pending_fetchers_;
|
|
|
| // Lets our client know we're done. Not valid in states START or DONE.
|
| - OldCompletionCallback* client_callback_;
|
| + net::CompletionCallback callback_;
|
|
|
| // Pointer to string we will write results to. Not valid in states
|
| // START and DONE.
|
|
|