diff options
Diffstat (limited to 'net/proxy/proxy_script_fetcher_impl.h')
| -rw-r--r-- | net/proxy/proxy_script_fetcher_impl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h index 964030a..927c2c5 100644 --- a/net/proxy/proxy_script_fetcher_impl.h +++ b/net/proxy/proxy_script_fetcher_impl.h @@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/string16.h" #include "base/task.h" #include "base/time.h" @@ -47,7 +48,7 @@ class NET_EXPORT ProxyScriptFetcherImpl : public ProxyScriptFetcher, // ProxyScriptFetcher methods: virtual int Fetch(const GURL& url, string16* text, - OldCompletionCallback* callback) OVERRIDE; + const net::CompletionCallback& callback) OVERRIDE; virtual void Cancel() OVERRIDE; virtual URLRequestContext* GetRequestContext() const OVERRIDE; @@ -82,7 +83,7 @@ class NET_EXPORT ProxyScriptFetcherImpl : public ProxyScriptFetcher, // Factory for creating the time-out task. This takes care of revoking // outstanding tasks when |this| is deleted. - ScopedRunnableMethodFactory<ProxyScriptFetcherImpl> task_factory_; + base::WeakPtrFactory<ProxyScriptFetcherImpl> weak_factory_; // The context used for making network requests. URLRequestContext* url_request_context_; @@ -102,7 +103,7 @@ class NET_EXPORT ProxyScriptFetcherImpl : public ProxyScriptFetcher, int cur_request_id_; // Callback to invoke on completion of the fetch. - OldCompletionCallback* callback_; + net::CompletionCallback callback_; // Holds the error condition that was hit on the current request, or OK. int result_code_; |