Extracting NetLog inner classes into their own classes.

chrome/test/chromedriver/net/adb_client_socket.cc

 // Copyright (c) 2013 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 "chrome/test/chromedriver/net/adb_client_socket.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
+#include "net/log/net_log_source.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace {
 
 const int kBufferSize = 16 * 1024;
 const char kOkayResponse[] = "OKAY";
 const char kHostTransportCommand[] = "host:transport:%s";
 const char kLocalAbstractCommand[] = "localabstract:%s";
 
 typedef base::Callback<void(int, const std::string&)> CommandCallback;
@@ skipping 295 matching lines @@
 #if defined(DEBUG_DEVTOOLS)
   if (serial.empty()) {
     // Use plain socket for remote debugging on Desktop (debugging purposes).
     int tcp_port = 0;
     if (!base::StringToInt(socket_name, &tcp_port))
       tcp_port = 9222;
 
     net::AddressList address_list = net::AddressList::CreateFromIPAddress(
         net::IPAddress::IPv4Localhost(), tcp_port);
     net::TCPClientSocket* socket = new net::TCPClientSocket(
-        address_list, NULL, net::NetLog::Source());
+        address_list, NULL, net::NetLogSource());
     socket->Connect(base::Bind(&UseTransportQueryForDesktop, callback, socket));
     return;
   }
 #endif  // defined(DEBUG_DEVTOOLS)
   new AdbTransportSocket(port, serial, socket_name, callback);
 }
 
 // static
 void AdbClientSocket::HttpQuery(int port,
                                 const std::string& serial,
@@ skipping 24 matching lines @@
   // only return IPv6 address while current adb (1.0.36) will always listen
   // on IPv4. So just try IPv4 first, then fall back to IPv6.
   net::IPAddressList list = {net::IPAddress::IPv4Localhost(),
                              net::IPAddress::IPv6Localhost()};
   net::AddressList ip_list = net::AddressList::CreateFromIPAddressList(
       list, "localhost");
   net::AddressList address_list = net::AddressList::CopyWithPort(
       ip_list, port_);
 
   socket_.reset(new net::TCPClientSocket(address_list, NULL, NULL,
-                                         net::NetLog::Source()));
+                                         net::NetLogSource()));
   int result = socket_->Connect(callback);
   if (result != net::ERR_IO_PENDING)
     callback.Run(result);
 }
 
 void AdbClientSocket::SendCommand(const std::string& command,
                                   bool is_void,
                                   bool has_length,
                                   const CommandCallback& callback) {
   scoped_refptr<net::StringIOBuffer> request_buffer =
@@ skipping 144 matching lines @@
                                     base::Unretained(this),
                                     callback,
                                     new_response,
                                     response_buffer,
                                     bytes_left));
   if (result > 0)
     OnResponseData(callback, new_response, response_buffer, bytes_left, result);
   else if (result != net::ERR_IO_PENDING)
     callback.Run(net::OK, new_response);
 }