From f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 Mon Sep 17 00:00:00 2001
From: "willchan@chromium.org"
 <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 1 Oct 2011 20:38:10 +0000
Subject: 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
---
 net/proxy/mock_proxy_resolver.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'net/proxy/mock_proxy_resolver.cc')

diff --git a/net/proxy/mock_proxy_resolver.cc b/net/proxy/mock_proxy_resolver.cc
index bb29984..c73daad 100644
--- a/net/proxy/mock_proxy_resolver.cc
+++ b/net/proxy/mock_proxy_resolver.cc
@@ -13,7 +13,7 @@ MockAsyncProxyResolverBase::Request::Request(
     MockAsyncProxyResolverBase* resolver,
             const GURL& url,
             ProxyInfo* results,
-            CompletionCallback* callback)
+            OldCompletionCallback* callback)
         : resolver_(resolver),
           url_(url),
           results_(results),
@@ -22,7 +22,7 @@ MockAsyncProxyResolverBase::Request::Request(
     }
 
     void MockAsyncProxyResolverBase::Request::CompleteNow(int rv) {
-      CompletionCallback* callback = callback_;
+      OldCompletionCallback* callback = callback_;
 
       // May delete |this|.
       resolver_->RemovePendingRequest(this);
@@ -36,7 +36,7 @@ MockAsyncProxyResolverBase::Request::~Request() {}
 MockAsyncProxyResolverBase::SetPacScriptRequest::SetPacScriptRequest(
         MockAsyncProxyResolverBase* resolver,
         const scoped_refptr<ProxyResolverScriptData>& script_data,
-        CompletionCallback* callback)
+        OldCompletionCallback* callback)
         : resolver_(resolver),
           script_data_(script_data),
           callback_(callback),
@@ -46,7 +46,7 @@ MockAsyncProxyResolverBase::SetPacScriptRequest::SetPacScriptRequest(
 MockAsyncProxyResolverBase::SetPacScriptRequest::~SetPacScriptRequest() {}
 
     void MockAsyncProxyResolverBase::SetPacScriptRequest::CompleteNow(int rv) {
-       CompletionCallback* callback = callback_;
+       OldCompletionCallback* callback = callback_;
 
       // Will delete |this|.
       resolver_->RemovePendingSetPacScriptRequest(this);
@@ -58,7 +58,7 @@ MockAsyncProxyResolverBase::~MockAsyncProxyResolverBase() {}
 
 int MockAsyncProxyResolverBase::GetProxyForURL(const GURL& url,
                                                ProxyInfo* results,
-                                               CompletionCallback* callback,
+                                               OldCompletionCallback* callback,
                                                RequestHandle* request_handle,
                                                const BoundNetLog& /*net_log*/) {
   scoped_refptr<Request> request = new Request(this, url, results, callback);
@@ -79,7 +79,7 @@ void MockAsyncProxyResolverBase::CancelRequest(RequestHandle request_handle) {
 
 int MockAsyncProxyResolverBase::SetPacScript(
     const scoped_refptr<ProxyResolverScriptData>& script_data,
-    CompletionCallback* callback) {
+    OldCompletionCallback* callback) {
   DCHECK(!pending_set_pac_script_request_.get());
   pending_set_pac_script_request_.reset(
       new SetPacScriptRequest(this, script_data, callback));
-- 
cgit v1.1