Index: net/proxy/mock_proxy_resolver.h |
diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h |
index bff2a71089c22505aa8c8a236884f6a9986a8ac1..bf1b4a96d64456cf0cc8d6187a01d5c6cc9db4d0 100644 |
--- a/net/proxy/mock_proxy_resolver.h |
+++ b/net/proxy/mock_proxy_resolver.h |
@@ -26,11 +26,11 @@ class MockAsyncProxyResolverBase : public ProxyResolver { |
Request(MockAsyncProxyResolverBase* resolver, |
const GURL& url, |
ProxyInfo* results, |
- OldCompletionCallback* callback); |
+ const net::CompletionCallback& callback); |
const GURL& url() const { return url_; } |
ProxyInfo* results() const { return results_; } |
- OldCompletionCallback* callback() const { return callback_; } |
+ const net::CompletionCallback& callback() const { return callback_; } |
void CompleteNow(int rv); |
@@ -42,7 +42,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver { |
MockAsyncProxyResolverBase* resolver_; |
const GURL url_; |
ProxyInfo* results_; |
- OldCompletionCallback* callback_; |
+ net::CompletionCallback callback_; |
MessageLoop* origin_loop_; |
}; |
@@ -51,7 +51,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver { |
SetPacScriptRequest( |
MockAsyncProxyResolverBase* resolver, |
const scoped_refptr<ProxyResolverScriptData>& script_data, |
- OldCompletionCallback* callback); |
+ const net::CompletionCallback& callback); |
~SetPacScriptRequest(); |
const ProxyResolverScriptData* script_data() const { return script_data_; } |
@@ -61,7 +61,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver { |
private: |
MockAsyncProxyResolverBase* resolver_; |
const scoped_refptr<ProxyResolverScriptData> script_data_; |
- OldCompletionCallback* callback_; |
+ net::CompletionCallback callback_; |
MessageLoop* origin_loop_; |
}; |
@@ -69,10 +69,10 @@ class MockAsyncProxyResolverBase : public ProxyResolver { |
virtual ~MockAsyncProxyResolverBase(); |
- // ProxyResolver implementation: |
+ // ProxyResolver implementation. |
virtual int GetProxyForURL(const GURL& url, |
ProxyInfo* results, |
- OldCompletionCallback* callback, |
+ const net::CompletionCallback& callback, |
RequestHandle* request_handle, |
const BoundNetLog& /*net_log*/) OVERRIDE; |
virtual void CancelRequest(RequestHandle request_handle) OVERRIDE; |
@@ -81,7 +81,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver { |
RequestHandle request_handle) const OVERRIDE; |
virtual int SetPacScript( |
const scoped_refptr<ProxyResolverScriptData>& script_data, |
- OldCompletionCallback* callback) OVERRIDE; |
+ const net::CompletionCallback& callback) OVERRIDE; |
virtual void CancelSetPacScript() OVERRIDE; |
const RequestsList& pending_requests() const { |