Extracting NetLog inner classes into their own classes.

net/dns/dns_session.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/dns/dns_session.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sample_vector.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/dns/dns_config_service.h"
 #include "net/dns/dns_socket_pool.h"
 #include "net/dns/dns_util.h"
 #include "net/log/net_log_event_type.h"
+#include "net/log/net_log_source.h"
+#include "net/log/net_log_with_source.h"
 #include "net/socket/stream_socket.h"
 #include "net/udp/datagram_client_socket.h"
 
 namespace net {
 
 namespace {
 
 // Set min timeout, in case we are talking to a local DNS proxy.
 const unsigned kMinTimeoutMs = 10;
 
@@ skipping 225 matching lines @@
 base::TimeDelta DnsSession::NextTimeout(unsigned server_index, int attempt) {
   // Respect initial timeout (from config or field trial) if it exceeds max.
   if (initial_timeout_ > max_timeout_)
     return initial_timeout_;
   return NextTimeoutFromHistogram(server_index, attempt);
 }
 
 // Allocate a socket, already connected to the server address.
 std::unique_ptr<DnsSession::SocketLease> DnsSession::AllocateSocket(
     unsigned server_index,
-    const NetLog::Source& source) {
+    const NetLogSource& source) {
   std::unique_ptr<DatagramClientSocket> socket;
 
   socket = socket_pool_->AllocateSocket(server_index);
   if (!socket.get())
     return std::unique_ptr<SocketLease>();
 
   socket->NetLog().BeginEvent(NetLogEventType::SOCKET_IN_USE,
                               source.ToEventParametersCallback());
 
   SocketLease* lease = new SocketLease(this, server_index, std::move(socket));
   return std::unique_ptr<SocketLease>(lease);
 }
 
 std::unique_ptr<StreamSocket> DnsSession::CreateTCPSocket(
     unsigned server_index,
-    const NetLog::Source& source) {
+    const NetLogSource& source) {
   return socket_pool_->CreateTCPSocket(server_index, source);
 }
 
 void DnsSession::ApplyPersistentData(const base::Value& data) {}
 
 std::unique_ptr<const base::Value> DnsSession::GetPersistentData() const {
   return std::unique_ptr<const base::Value>();
 }
 
 // Release a socket.
@@ skipping 45 matching lines @@
 
   timeout = std::max(timeout, base::TimeDelta::FromMilliseconds(kMinTimeoutMs));
 
   // The timeout still doubles every full round.
   unsigned num_backoffs = attempt / config_.nameservers.size();
 
   return std::min(timeout * (1 << num_backoffs), max_timeout_);
 }
 
 }  // namespace net