base::Bind: Convert ServerSocket::Accept.

net/socket/tcp_server_socket_win.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_win.h"
 
 #include <mstcpip.h>
 
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/winsock_init.h"
 #include "net/base/winsock_util.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace net {
 
 TCPServerSocketWin::TCPServerSocketWin(net::NetLog* net_log,
                                        const net::NetLog::Source& source)
     : socket_(INVALID_SOCKET),
       socket_event_(WSA_INVALID_EVENT),
       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);
   EnsureWinsockInit();
 }
 
 TCPServerSocketWin::~TCPServerSocketWin() {
   Close();
@@ skipping 58 matching lines @@
   struct sockaddr* addr = reinterpret_cast<struct sockaddr*>(&addr_storage);
   if (getsockname(socket_, addr, &addr_len))
     return MapSystemError(WSAGetLastError());
   if (!address->FromSockAddr(addr, addr_len))
     return ERR_FAILED;
 
   return OK;
 }
 
 int TCPServerSocketWin::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) {
     // Start watching
     WSAEventSelect(socket_, socket_event_, FD_ACCEPT);
     accept_watcher_.StartWatching(socket_event_, this);
 
@@ skipping 58 matching lines @@
 void TCPServerSocketWin::OnObjectSignaled(HANDLE object) {
   WSANETWORKEVENTS ev;
   if (WSAEnumNetworkEvents(socket_, socket_event_, &ev) == SOCKET_ERROR) {
     PLOG(ERROR) << "WSAEnumNetworkEvents()";
     return;
   }
 
   if (ev.lNetworkEvents & FD_ACCEPT) {
     int result = AcceptInternal(accept_socket_);
     if (result != ERR_IO_PENDING) {
-      OldCompletionCallback* c = accept_callback_;
-      accept_callback_ = NULL;
       accept_socket_ = NULL;
-      c->Run(result);
+      accept_callback_.Run(result);
+      accept_callback_.Reset();
     }
   }
 }
 
 }  // namespace net