NetLogEventParameter to Callback refactoring 9.

net/socket/tcp_server_socket_win.cc

 // Copyright (c) 2012 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/socket_net_log_params.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),
       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);
+  net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE,
+                      source.ToEventParametersCallback());
   EnsureWinsockInit();
 }
 
 TCPServerSocketWin::~TCPServerSocketWin() {
   Close();
-  net_log_.EndEvent(NetLog::TYPE_SOCKET_ALIVE, NULL);
+  net_log_.EndEvent(NetLog::TYPE_SOCKET_ALIVE);
 }
 
 int TCPServerSocketWin::Listen(const IPEndPoint& address, int backlog) {
   DCHECK(CalledOnValidThread());
   DCHECK_GT(backlog, 0);
   DCHECK_EQ(socket_, INVALID_SOCKET);
   DCHECK_EQ(socket_event_, WSA_INVALID_EVENT);
 
   socket_event_ = WSACreateEvent();
   if (socket_event_ == WSA_INVALID_EVENT) {
@@ skipping 49 matching lines @@
   return OK;
 }
 
 int TCPServerSocketWin::Accept(
     scoped_ptr<StreamSocket>* socket, const CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(socket);
   DCHECK(!callback.is_null());
   DCHECK(accept_callback_.is_null());
 
-  net_log_.BeginEvent(NetLog::TYPE_TCP_ACCEPT, NULL);
+  net_log_.BeginEvent(NetLog::TYPE_TCP_ACCEPT);
 
   int result = AcceptInternal(socket);
 
   if (result == ERR_IO_PENDING) {
     // Start watching
     WSAEventSelect(socket_, socket_event_, FD_ACCEPT);
     accept_watcher_.StartWatching(socket_event_, this);
 
     accept_socket_ = socket;
     accept_callback_ = callback;
@@ skipping 25 matching lines @@
       net_log_.net_log(), net_log_.source()));
   int adopt_result = tcp_socket->AdoptSocket(new_socket);
   if (adopt_result != OK) {
     if (closesocket(new_socket) < 0)
       PLOG(ERROR) << "closesocket";
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, adopt_result);
     return adopt_result;
   }
   socket->reset(tcp_socket.release());
   net_log_.EndEvent(NetLog::TYPE_TCP_ACCEPT,
-                    make_scoped_refptr(new NetLogStringParameter(
-                        "address", address.ToString())));
+                    CreateNetLogIPEndPointCallback(&address));
   return OK;
 }
 
 void TCPServerSocketWin::Close() {
   if (socket_ != INVALID_SOCKET) {
     if (closesocket(socket_) < 0)
       PLOG(ERROR) << "closesocket";
     socket_ = INVALID_SOCKET;
   }
 
@@ skipping 15 matching lines @@
     if (result != ERR_IO_PENDING) {
       accept_socket_ = NULL;
       CompletionCallback callback = accept_callback_;
       accept_callback_.Reset();
       callback.Run(result);
     }
   }
 }
 
 }  // namespace net