base::Bind: Convert ServerSocket::Accept.

content/browser/renderer_host/p2p/socket_host_tcp_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 "content/browser/renderer_host/p2p/socket_host_tcp_server.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 #include "content/common/p2p_messages.h"
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/socket/stream_socket.h"
 
 namespace {
 const int kListenBacklog = 5;
 }  // namespace
 
 namespace content {
 
 P2PSocketHostTcpServer::P2PSocketHostTcpServer(
     IPC::Message::Sender* message_sender,
     int routing_id, int id)
     : P2PSocketHost(message_sender, routing_id, id),
       socket_(new net::TCPServerSocket(NULL, net::NetLog::Source())),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          accept_callback_(this, &P2PSocketHostTcpServer::OnAccepted)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(accept_callback_(
+          base::Bind(&P2PSocketHostTcpServer::OnAccepted,
+                     base::Unretained(this)))) {
 }
 
 P2PSocketHostTcpServer::~P2PSocketHostTcpServer() {
   STLDeleteContainerPairSecondPointers(accepted_sockets_.begin(),
                                        accepted_sockets_.end());
 
   if (state_ == STATE_OPEN) {
     DCHECK(socket_.get());
     socket_.reset();
   }
@@ skipping 30 matching lines @@
   socket_.reset();
 
   if (state_ == STATE_UNINITIALIZED || state_ == STATE_OPEN)
     message_sender_->Send(new P2PMsg_OnError(routing_id_, id_));
 
   state_ = STATE_ERROR;
 }
 
 void P2PSocketHostTcpServer::DoAccept() {
   while (true) {
-    int result = socket_->Accept(&accept_socket_, &accept_callback_);
+    int result = socket_->Accept(&accept_socket_, accept_callback_);
     if (result == net::ERR_IO_PENDING) {
       break;
     } else {
       HandleAcceptResult(result);
     }
   }
 }
 
 void P2PSocketHostTcpServer::HandleAcceptResult(int result) {
   if (result < 0) {
@@ skipping 42 matching lines @@
   accepted_sockets_.erase(it);
   scoped_ptr<P2PSocketHostTcp> result(
       new P2PSocketHostTcp(message_sender_, routing_id_, id));
   if (!result->InitAccepted(remote_address, socket))
     return NULL;
 
   return result.release();
 }
 
 }  // namespace content