Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Unified Diff: net/proxy/mock_proxy_resolver.h

Issue 8985012: base::Bind: Convert net/proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more include. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc ('k') | net/proxy/mock_proxy_resolver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc ('k') | net/proxy/mock_proxy_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698