net: rename BoundNetLog to NetLogWithSource

net/socket/transport_client_socket_pool.h

 // 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.
 
 #ifndef NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "net/base/host_port_pair.h"
 #include "net/dns/host_resolver.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/connection_attempts.h"
 
 namespace net {
 
 class ClientSocketFactory;
 class SocketPerformanceWatcherFactory;
 
-typedef base::Callback<int(const AddressList&, const BoundNetLog& net_log)>
-OnHostResolutionCallback;
+typedef base::Callback<int(const AddressList&, const NetLogWithSource& net_log)>
+    OnHostResolutionCallback;
 
 class NET_EXPORT_PRIVATE TransportSocketParams
     : public base::RefCounted<TransportSocketParams> {
  public:
   // CombineConnectAndWrite currently translates to using TCP FastOpen.
   // TCP FastOpen should not be used if the first write to the socket may
   // be non-idempotent, as the underlying socket could retransmit the data
   // on failure of the first transmission.
   // NOTE: Currently, COMBINE_CONNECT_AND_WRITE_DESIRED is used if the data in
   // the write is known to be idempotent, and COMBINE_CONNECT_AND_WRITE_DEFAULT
@@ skipping 170 matching lines @@
 
   ~TransportClientSocketPool() override;
 
   // ClientSocketPool implementation.
   int RequestSocket(const std::string& group_name,
                     const void* resolve_info,
                     RequestPriority priority,
                     RespectLimits respect_limits,
                     ClientSocketHandle* handle,
                     const CompletionCallback& callback,
-                    const BoundNetLog& net_log) override;
+                    const NetLogWithSource& net_log) override;
   void RequestSockets(const std::string& group_name,
                       const void* params,
                       int num_sockets,
-                      const BoundNetLog& net_log) override;
+                      const NetLogWithSource& net_log) override;
   void CancelRequest(const std::string& group_name,
                      ClientSocketHandle* handle) override;
   void ReleaseSocket(const std::string& group_name,
                      std::unique_ptr<StreamSocket> socket,
                      int id) override;
   void FlushWithError(int error) override;
   void CloseIdleSockets() override;
   int IdleSocketCount() const override;
   int IdleSocketCountInGroup(const std::string& group_name) const override;
   LoadState GetLoadState(const std::string& group_name,
                          const ClientSocketHandle* handle) const override;
   std::unique_ptr<base::DictionaryValue> GetInfoAsValue(
       const std::string& name,
       const std::string& type,
       bool include_nested_pools) const override;
   base::TimeDelta ConnectionTimeout() const override;
 
   // HigherLayeredPool implementation.
   bool IsStalled() const override;
   void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override;
   void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override;
 
  protected:
   // Methods shared with WebSocketTransportClientSocketPool
   void NetLogTcpClientSocketPoolRequestedSocket(
-      const BoundNetLog& net_log,
+      const NetLogWithSource& net_log,
       const scoped_refptr<TransportSocketParams>* casted_params);
 
  private:
   typedef ClientSocketPoolBase<TransportSocketParams> PoolBase;
 
   class TransportConnectJobFactory
       : public PoolBase::ConnectJobFactory {
    public:
     TransportConnectJobFactory(
         ClientSocketFactory* client_socket_factory,
@@ skipping 27 matching lines @@
   };
 
   PoolBase base_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportClientSocketPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_