base::Bind: Convert ServerSocket::Accept.

net/socket/tcp_server_socket_libevent.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/socket/tcp_server_socket_libevent.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/socket.h>
@@ skipping 16 matching lines @@
 
 const int kInvalidSocket = -1;
 
 }  // namespace
 
 TCPServerSocketLibevent::TCPServerSocketLibevent(
     net::NetLog* net_log,
     const net::NetLog::Source& source)
     : socket_(kInvalidSocket),
       accept_socket_(NULL),
-      accept_callback_(NULL),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) {
   scoped_refptr<NetLog::EventParameters> params;
   if (source.is_valid())
     params = new NetLogSourceParameter("source_dependency", source);
   net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE, params);
 }
 
 TCPServerSocketLibevent::~TCPServerSocketLibevent() {
   if (socket_ != kInvalidSocket)
     Close();
@@ skipping 51 matching lines @@
   struct sockaddr* addr = reinterpret_cast<struct sockaddr*>(&addr_storage);
   if (getsockname(socket_, addr, &addr_len) < 0)
     return MapSystemError(errno);
   if (!address->FromSockAddr(addr, addr_len))
     return ERR_FAILED;
 
   return OK;
 }
 
 int TCPServerSocketLibevent::Accept(
-    scoped_ptr<StreamSocket>* socket, OldCompletionCallback* callback) {
+    scoped_ptr<StreamSocket>* socket, const CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(socket);
-  DCHECK(callback);
-  DCHECK(!accept_callback_);
+  DCHECK(!callback.is_null());
+  DCHECK(accept_callback_.is_null());
 
   net_log_.BeginEvent(NetLog::TYPE_TCP_ACCEPT, NULL);
 
   int result = AcceptInternal(socket);
 
   if (result == ERR_IO_PENDING) {
     if (!MessageLoopForIO::current()->WatchFileDescriptor(
             socket_, true, MessageLoopForIO::WATCH_READ,
             &accept_socket_watcher_, this)) {
       PLOG(ERROR) << "WatchFileDescriptor failed on read";
@@ skipping 54 matching lines @@
       PLOG(ERROR) << "close";
     socket_ = kInvalidSocket;
   }
 }
 
 void TCPServerSocketLibevent::OnFileCanReadWithoutBlocking(int fd) {
   DCHECK(CalledOnValidThread());
 
   int result = AcceptInternal(accept_socket_);
   if (result != ERR_IO_PENDING) {
-    OldCompletionCallback* c = accept_callback_;
-    accept_callback_ = NULL;
     accept_socket_ = NULL;
     bool ok = accept_socket_watcher_.StopWatchingFileDescriptor();
     DCHECK(ok);
-    c->Run(result);
+    accept_callback_.Run(result);
+    accept_callback_.Reset();
   }
 }
 
 void TCPServerSocketLibevent::OnFileCanWriteWithoutBlocking(int fd) {
   NOTREACHED();
 }
 
 }  // namespace net