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

4 files changed, 13 insertions, 13 deletions

diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index cbf7592..18db83c 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -182,7 +182,7 @@ void WebSocketJob::DetachDelegate() {
 }
 
 int WebSocketJob::OnStartOpenConnection(
-    SocketStream* socket, CompletionCallback* callback) {
+    SocketStream* socket, OldCompletionCallback* callback) {
   DCHECK(!callback_);
   state_ = CONNECTING;
   addresses_ = socket->address_list();
@@ -633,7 +633,7 @@ void WebSocketJob::RetryPendingIO() {
 void WebSocketJob::CompleteIO(int result) {
   // |callback_| may be NULL if OnClose() or DetachDelegate() was called.
   if (callback_) {
-    net::CompletionCallback* callback = callback_;
+    net::OldCompletionCallback* callback = callback_;
     callback_ = NULL;
     callback->Run(result);
     Release();  // Balanced with OnStartOpenConnection().
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index 1543f93..041cc8a 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -64,7 +64,7 @@ class NET_EXPORT WebSocketJob
 
   // SocketStream::Delegate methods.
   virtual int OnStartOpenConnection(
-      SocketStream* socket, CompletionCallback* callback);
+      SocketStream* socket, OldCompletionCallback* callback);
   virtual void OnConnected(SocketStream* socket, int max_pending_send_allowed);
   virtual void OnSentData(SocketStream* socket, int amount_sent);
   virtual void OnReceivedData(SocketStream* socket, const char* data, int len);
@@ -119,7 +119,7 @@ class NET_EXPORT WebSocketJob
   State state_;
   bool waiting_;
   AddressList addresses_;
-  CompletionCallback* callback_;  // for throttling.
+  OldCompletionCallback* callback_;  // for throttling.
 
   scoped_ptr<WebSocketHandshakeRequestHandler> handshake_request_;
   scoped_ptr<WebSocketHandshakeResponseHandler> handshake_response_;
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index 9a1a8bc..131f2d3 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -88,7 +88,7 @@ class MockSocketStreamDelegate : public net::SocketStream::Delegate {
   }
 
   virtual int OnStartOpenConnection(net::SocketStream* socket,
-                                    net::CompletionCallback* callback) {
+                                    net::OldCompletionCallback* callback) {
     if (on_start_open_connection_.get())
       on_start_open_connection_->Run();
     return net::OK;
@@ -441,7 +441,7 @@ class WebSocketJobTest : public PlatformTest {
   scoped_refptr<SocketStream> socket_;
   scoped_ptr<MockClientSocketFactory> socket_factory_;
   scoped_refptr<OrderedSocketData> data_;
-  TestCompletionCallback sync_callback_;
+  TestOldCompletionCallback sync_callback_;
   scoped_refptr<MockSSLConfigService> ssl_config_service_;
   scoped_ptr<net::ProxyService> proxy_service_;
   scoped_ptr<net::MockHostResolver> host_resolver_;
diff --git a/net/websockets/websocket_throttle_unittest.cc b/net/websockets/websocket_throttle_unittest.cc
index c1c8480..909dcf9 100644
--- a/net/websockets/websocket_throttle_unittest.cc
+++ b/net/websockets/websocket_throttle_unittest.cc
@@ -100,7 +100,7 @@ TEST_F(WebSocketThrottleTest, Throttle) {
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket1";
-  TestCompletionCallback callback_s1;
+  TestOldCompletionCallback callback_s1;
   // Trying to open connection to host1 will start without wait.
   EXPECT_EQ(OK, w1->OnStartOpenConnection(s1, &callback_s1));
 
@@ -121,7 +121,7 @@ TEST_F(WebSocketThrottleTest, Throttle) {
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket2";
-  TestCompletionCallback callback_s2;
+  TestOldCompletionCallback callback_s2;
   // Trying to open connection to host2 will wait for w1.
   EXPECT_EQ(ERR_IO_PENDING, w2->OnStartOpenConnection(s2, &callback_s2));
   // Now waiting queue looks like
@@ -141,7 +141,7 @@ TEST_F(WebSocketThrottleTest, Throttle) {
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket3";
-  TestCompletionCallback callback_s3;
+  TestOldCompletionCallback callback_s3;
   // Trying to open connection to host3 will wait for w1.
   EXPECT_EQ(ERR_IO_PENDING, w3->OnStartOpenConnection(s3, &callback_s3));
   // Address | head -> tail
@@ -161,7 +161,7 @@ TEST_F(WebSocketThrottleTest, Throttle) {
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket4";
-  TestCompletionCallback callback_s4;
+  TestOldCompletionCallback callback_s4;
   // Trying to open connection to host4 will wait for w1, w2.
   EXPECT_EQ(ERR_IO_PENDING, w4->OnStartOpenConnection(s4, &callback_s4));
   // Address | head -> tail
@@ -180,7 +180,7 @@ TEST_F(WebSocketThrottleTest, Throttle) {
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket5";
-  TestCompletionCallback callback_s5;
+  TestOldCompletionCallback callback_s5;
   // Trying to open connection to host5 will wait for w1, w4
   EXPECT_EQ(ERR_IO_PENDING, w5->OnStartOpenConnection(s5, &callback_s5));
   // Address | head -> tail
@@ -199,7 +199,7 @@ TEST_F(WebSocketThrottleTest, Throttle) {
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket6";
-  TestCompletionCallback callback_s6;
+  TestOldCompletionCallback callback_s6;
   // Trying to open connection to host6 will wait for w1, w4, w5
   EXPECT_EQ(ERR_IO_PENDING, w6->OnStartOpenConnection(s6, &callback_s6));
   // Address | head -> tail
@@ -311,7 +311,7 @@ TEST_F(WebSocketThrottleTest, NoThrottleForDuplicateAddress) {
   DeleteAddrInfo(addr);
 
   DVLOG(1) << "socket1";
-  TestCompletionCallback callback_s1;
+  TestOldCompletionCallback callback_s1;
   // Trying to open connection to localhost will start without wait.
   EXPECT_EQ(OK, w1->OnStartOpenConnection(s1, &callback_s1));