Index: net/proxy/dhcp_proxy_script_adapter_fetcher_win.h |
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h |
index 562441f96ad1e3681459ff19c289e9887ce61176..54954fc8134de04dbfe89c3b0b281ed2823de7d6 100644 |
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h |
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h |
@@ -43,7 +43,7 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptAdapterFetcher |
// You may only call Fetch() once on a given instance of |
// DhcpProxyScriptAdapterFetcher. |
virtual void Fetch(const std::string& adapter_name, |
- OldCompletionCallback* callback); |
+ const net::CompletionCallback& callback); |
// Cancels the fetch on this adapter. |
virtual void Cancel(); |
@@ -159,15 +159,11 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptAdapterFetcher |
// Callback to let our client know we're done. Invalid in states |
// START, FINISH and CANCEL. |
- OldCompletionCallback* callback_; |
+ net::CompletionCallback callback_; |
// Fetcher to retrieve PAC files once URL is known. |
scoped_ptr<ProxyScriptFetcher> script_fetcher_; |
- // Callback from the script fetcher. |
- OldCompletionCallbackImpl<DhcpProxyScriptAdapterFetcher> |
- script_fetcher_callback_; |
- |
// Implements a timeout on the call to the Win32 DHCP API. |
base::OneShotTimer<DhcpProxyScriptAdapterFetcher> wait_timer_; |