base::Bind: Convert ServerSocket::Accept.

content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.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 "content/browser/renderer_host/p2p/socket_host_tcp_server.h"
 
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 #include "content/browser/renderer_host/p2p/socket_host_test_utils.h"
+#include "net/base/completion_callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::Return;
 
 namespace {
 
 class FakeServerSocket : public net::ServerSocket {
  public:
   FakeServerSocket()
       : listening_(false),
-        accept_socket_(NULL),
-        accept_callback_(NULL) {
+        accept_socket_(NULL) {
   }
 
-  ~FakeServerSocket() { }
+  virtual ~FakeServerSocket() {}
 
   bool listening() { return listening_; }
 
   void AddIncoming(net::StreamSocket* socket) {
-    if (accept_callback_) {
+    if (!accept_callback_.is_null()) {
       DCHECK(incoming_sockets_.empty());
       accept_socket_->reset(socket);
       accept_socket_ = NULL;
-      net::OldCompletionCallback* cb = accept_callback_;
-      accept_callback_ = NULL;
-      cb->Run(net::OK);
+
+      // This copy is necessary because this implementation of ServerSocket
+      // bases logic on the null-ness of |accept_callback_| in the bound
+      // callback.
+      net::CompletionCallback cb = accept_callback_;
+      accept_callback_.Reset();
+      cb.Run(net::OK);
     } else {
       incoming_sockets_.push_back(socket);
     }
   }
 
   // net::ServerSocket implementation.
   virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE {
     local_address_ = address;
     listening_ = true;
     return net::OK;
   }
 
   virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE {
     *address = local_address_;
     return net::OK;
   }
 
   virtual int Accept(scoped_ptr<net::StreamSocket>* socket,
-                     net::OldCompletionCallback* callback) OVERRIDE {
+                     const net::CompletionCallback& callback) OVERRIDE {
     DCHECK(socket);
     if (!incoming_sockets_.empty()) {
       socket->reset(incoming_sockets_.front());
       incoming_sockets_.pop_front();
       return net::OK;
     } else {
       accept_socket_ = socket;
       accept_callback_ = callback;
       return net::ERR_IO_PENDING;
     }
   }
 
  private:
   bool listening_;
 
   net::IPEndPoint local_address_;
 
   scoped_ptr<net::StreamSocket>* accept_socket_;
-  net::OldCompletionCallback* accept_callback_;
+  net::CompletionCallback accept_callback_;
 
   std::list<net::StreamSocket*> incoming_sockets_;
 };
 
 }  // namespace
 
 namespace content {
 
 class P2PSocketHostTcpServerTest : public testing::Test {
  protected:
@@ skipping 69 matching lines @@
   EXPECT_EQ(incoming1, GetSocketFormTcpSocketHost(
       reinterpret_cast<P2PSocketHostTcp*>(new_host1.get())));
   scoped_ptr<P2PSocketHost> new_host2(
       socket_host_->AcceptIncomingTcpConnection(addr2, kAcceptedSocketId2));
   ASSERT_TRUE(new_host2.get() != NULL);
   EXPECT_EQ(incoming2, GetSocketFormTcpSocketHost(
       reinterpret_cast<P2PSocketHostTcp*>(new_host2.get())));
 }
 
 }  // namespace content