Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).

net/socket/socks_client_socket.cc

 // Copyright (c) 2009 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/socks_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/trace_event.h"
 #include "net/base/io_buffer.h"
-#include "net/base/load_log.h"
+#include "net/base/net_log.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
 
 namespace net {
 
 // Every SOCKS server requests a user-id from the client. It is optional
 // and we send an empty string.
 static const char kEmptyUserId[] = "";
 
 // The SOCKS4a implementation suggests to use an invalid IP in case the DNS
@@ skipping 51 matching lines @@
       bytes_received_(0),
       host_resolver_(host_resolver),
       host_request_info_(req_info) {
 }
 
 SOCKSClientSocket::~SOCKSClientSocket() {
   Disconnect();
 }
 
 int SOCKSClientSocket::Connect(CompletionCallback* callback,
-                               LoadLog* load_log) {
+                               const BoundNetLog& net_log) {
   DCHECK(transport_.get());
   DCHECK(transport_->IsConnected());
   DCHECK_EQ(STATE_NONE, next_state_);
   DCHECK(!user_callback_);
 
   // If already connected, then just return OK.
   if (completed_handshake_)
     return OK;
 
   next_state_ = STATE_RESOLVE_HOST;
-  load_log_ = load_log;
+  net_log_ = net_log;
 
-  LoadLog::BeginEvent(load_log, LoadLog::TYPE_SOCKS_CONNECT);
+  net_log.BeginEvent(NetLog::TYPE_SOCKS_CONNECT);
 
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING) {
     user_callback_ = callback;
   } else {
-    LoadLog::EndEvent(load_log, LoadLog::TYPE_SOCKS_CONNECT);
-    load_log_ = NULL;
+    net_log.EndEvent(NetLog::TYPE_SOCKS_CONNECT);
+    net_log_ = BoundNetLog();
   }
   return rv;
 }
 
 void SOCKSClientSocket::Disconnect() {
   completed_handshake_ = false;
   host_resolver_.Cancel();
   transport_->Disconnect();
 
   // Reset other states to make sure they aren't mistakenly used later.
   // These are the states initialized by Connect().
   next_state_ = STATE_NONE;
   user_callback_ = NULL;
-  load_log_ = NULL;
+  net_log_ = BoundNetLog();
 }
 
 bool SOCKSClientSocket::IsConnected() const {
   return completed_handshake_ && transport_->IsConnected();
 }
 
 bool SOCKSClientSocket::IsConnectedAndIdle() const {
   return completed_handshake_ && transport_->IsConnectedAndIdle();
 }
 
@@ skipping 36 matching lines @@
   CompletionCallback* c = user_callback_;
   user_callback_ = NULL;
   DLOG(INFO) << "Finished setting up SOCKS handshake";
   c->Run(result);
 }
 
 void SOCKSClientSocket::OnIOComplete(int result) {
   DCHECK_NE(STATE_NONE, next_state_);
   int rv = DoLoop(result);
   if (rv != ERR_IO_PENDING) {
-    LoadLog::EndEvent(load_log_, LoadLog::TYPE_SOCKS_CONNECT);
-    load_log_ = NULL;
+    net_log_.EndEvent(NetLog::TYPE_SOCKS_CONNECT);
+    net_log_ = BoundNetLog();
     DoCallback(rv);
   }
 }
 
 int SOCKSClientSocket::DoLoop(int last_io_result) {
   DCHECK_NE(next_state_, STATE_NONE);
   int rv = last_io_result;
   do {
     State state = next_state_;
     next_state_ = STATE_NONE;
@@ skipping 26 matching lines @@
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
   return rv;
 }
 
 int SOCKSClientSocket::DoResolveHost() {
   DCHECK_EQ(kSOCKS4Unresolved, socks_version_);
 
   next_state_ = STATE_RESOLVE_HOST_COMPLETE;
   return host_resolver_.Resolve(
-      host_request_info_, &addresses_, &io_callback_, load_log_);
+      host_request_info_, &addresses_, &io_callback_, net_log_);
 }
 
 int SOCKSClientSocket::DoResolveHostComplete(int result) {
   DCHECK_EQ(kSOCKS4Unresolved, socks_version_);
 
   bool ok = (result == OK);
   next_state_ = STATE_HANDSHAKE_WRITE;
   if (ok) {
     DCHECK(addresses_.head());
 
@@ skipping 116 matching lines @@
   DCHECK_NE(kSOCKS4Unresolved, socks_version_);
 
   if (result < 0)
     return result;
 
   // The underlying socket closed unexpectedly.
   if (result == 0)
     return ERR_CONNECTION_CLOSED;
 
   if (bytes_received_ + result > kReadHeaderSize) {
-    // TODO(eroman): Describe failure in LoadLog.
+    // TODO(eroman): Describe failure in NetLog.
     return ERR_SOCKS_CONNECTION_FAILED;
   }
 
   buffer_.append(handshake_buf_->data(), result);
   bytes_received_ += result;
   if (bytes_received_ < kReadHeaderSize) {
     next_state_ = STATE_HANDSHAKE_READ;
     return OK;
   }
 
@@ skipping 26 matching lines @@
   }
 
   // Note: we ignore the last 6 bytes as specified by the SOCKS protocol
 }
 
 int SOCKSClientSocket::GetPeerAddress(AddressList* address) const {
   return transport_->GetPeerAddress(address);
 }
 
 }  // namespace net