diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
commit | f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch) | |
tree | 6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/proxy/mock_proxy_resolver.h | |
parent | d1666539b57bf8552e203d355fd09909d36f9732 (diff) | |
download | chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2 |
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback.
Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g.
BUG=98719
TEST=none
Review URL: http://codereview.chromium.org/8070013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/mock_proxy_resolver.h')
-rw-r--r-- | net/proxy/mock_proxy_resolver.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h index 6ee5e5a..8aa0101 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, - CompletionCallback* callback); + OldCompletionCallback* callback); const GURL& url() const { return url_; } ProxyInfo* results() const { return results_; } - CompletionCallback* callback() const { return callback_; } + OldCompletionCallback* callback() const { return callback_; } void CompleteNow(int rv); @@ -42,7 +42,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver { MockAsyncProxyResolverBase* resolver_; const GURL url_; ProxyInfo* results_; - CompletionCallback* callback_; + OldCompletionCallback* callback_; MessageLoop* origin_loop_; }; @@ -51,7 +51,7 @@ class MockAsyncProxyResolverBase : public ProxyResolver { SetPacScriptRequest( MockAsyncProxyResolverBase* resolver, const scoped_refptr<ProxyResolverScriptData>& script_data, - CompletionCallback* callback); + OldCompletionCallback* 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_; - CompletionCallback* callback_; + OldCompletionCallback* callback_; MessageLoop* origin_loop_; }; @@ -72,13 +72,13 @@ class MockAsyncProxyResolverBase : public ProxyResolver { // ProxyResolver implementation: virtual int GetProxyForURL(const GURL& url, ProxyInfo* results, - CompletionCallback* callback, + OldCompletionCallback* callback, RequestHandle* request_handle, const BoundNetLog& /*net_log*/) OVERRIDE; virtual void CancelRequest(RequestHandle request_handle) OVERRIDE; virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - CompletionCallback* callback) OVERRIDE; + OldCompletionCallback* callback) OVERRIDE; virtual void CancelSetPacScript() OVERRIDE; const RequestsList& pending_requests() const { |