Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind().

net/curvecp/test_server.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/curvecp/test_server.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 45 matching lines @@
 
 void TestServer::OnAccept(CurveCPServerSocket* new_socket) {
   DCHECK(new_socket);
   LOG(ERROR) << "Accepted socket! Starting Echo Server";
   EchoServer* new_server = new EchoServer();
   new_server->Start(new_socket);
 }
 
 EchoServer::EchoServer()
     : socket_(NULL),
-      bytes_received_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          read_callback_(this, &EchoServer::OnReadComplete)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          write_callback_(this, &EchoServer::OnWriteComplete)) {
+      bytes_received_(0) {
 }
 
 EchoServer::~EchoServer() {
 }
 
 void EchoServer::Start(CurveCPServerSocket* socket) {
   DCHECK(!socket_);
   socket_ = socket;
 
   ReadData();
@@ skipping 12 matching lines @@
 
   if (!received_stream_.VerifyBytes(read_buffer_->data(), result)) {
     LOG(ERROR) << "Server Received corrupt receive data!";
     delete this;
     return;
   }
 
   // Echo the read data back here.
   DCHECK(!write_buffer_.get());
   write_buffer_ = new DrainableIOBuffer(read_buffer_, result);
-  int rv = socket_->Write(write_buffer_, result, &write_callback_);
+  int rv = socket_->Write(write_buffer_, result,
+                          base::Bind(&EchoServer::OnWriteComplete,
+                                     base::Unretained(this)));
   if (rv == ERR_IO_PENDING)
     return;
   OnWriteComplete(rv);
 }
 
 void EchoServer::OnWriteComplete(int result) {
   if (result <= 0) {
     delete this;
     return;
   }
 
   write_buffer_->DidConsume(result);
   while (write_buffer_->BytesRemaining()) {
     int rv = socket_->Write(write_buffer_,
                             write_buffer_->BytesRemaining(),
-                            &write_callback_);
+                            base::Bind(&EchoServer::OnWriteComplete,
+                                       base::Unretained(this)));
     if (rv == ERR_IO_PENDING)
       return;
     OnWriteComplete(rv);
   }
 
   // Now we can read more data.
   write_buffer_ = NULL;
   // read_buffer_ = NULL;
   // ReadData();
 }
 
 void EchoServer::ReadData() {
   DCHECK(!read_buffer_.get());
   read_buffer_ = new IOBuffer(kMaxMessage);
 
   int rv;
   do {
-    rv = socket_->Read(read_buffer_, kMaxMessage, &read_callback_);
+    rv = socket_->Read(read_buffer_, kMaxMessage,
+                       base::Bind(&EchoServer::OnReadComplete,
+                                  base::Unretained(this)));
     if (rv == ERR_IO_PENDING)
       return;
     OnReadComplete(rv);  // Complete the read manually
   } while (rv > 0);
 }
 
 }  // namespace net