| Index: net/socket/transport_client_socket_pool.h
|
| diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h
|
| index 036fd9fcddd348d044fc02b676c3045640b5b702..dfd68c2529ee8379e3d7f5fb4963a946b9ac13ea 100644
|
| --- a/net/socket/transport_client_socket_pool.h
|
| +++ b/net/socket/transport_client_socket_pool.h
|
| @@ -22,6 +22,7 @@
|
| namespace net {
|
|
|
| class ClientSocketFactory;
|
| +class SocketPerformanceWatcherFactory;
|
|
|
| typedef base::Callback<int(const AddressList&, const BoundNetLog& net_log)>
|
| OnHostResolutionCallback;
|
| @@ -156,14 +157,16 @@ class NET_EXPORT_PRIVATE TransportConnectJobHelper {
|
| // a headstart) and return the one that completes first to the socket pool.
|
| class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob {
|
| public:
|
| - TransportConnectJob(const std::string& group_name,
|
| - RequestPriority priority,
|
| - const scoped_refptr<TransportSocketParams>& params,
|
| - base::TimeDelta timeout_duration,
|
| - ClientSocketFactory* client_socket_factory,
|
| - HostResolver* host_resolver,
|
| - Delegate* delegate,
|
| - NetLog* net_log);
|
| + TransportConnectJob(
|
| + const std::string& group_name,
|
| + RequestPriority priority,
|
| + const scoped_refptr<TransportSocketParams>& params,
|
| + base::TimeDelta timeout_duration,
|
| + ClientSocketFactory* client_socket_factory,
|
| + const SocketPerformanceWatcherFactory* socket_performance_watcher_factory,
|
| + HostResolver* host_resolver,
|
| + Delegate* delegate,
|
| + NetLog* net_log);
|
| ~TransportConnectJob() override;
|
|
|
| // ConnectJob methods.
|
| @@ -207,6 +210,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob {
|
| scoped_ptr<AddressList> fallback_addresses_;
|
| base::TimeTicks fallback_connect_start_time_;
|
| base::OneShotTimer fallback_timer_;
|
| + const SocketPerformanceWatcherFactory* socket_performance_watcher_factory_;
|
|
|
| // Track the interval between this connect and previous connect.
|
| ConnectInterval interval_between_connects_;
|
| @@ -233,6 +237,7 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool {
|
| int max_sockets_per_group,
|
| HostResolver* host_resolver,
|
| ClientSocketFactory* client_socket_factory,
|
| + const SocketPerformanceWatcherFactory* socket_performance_watcher_factory,
|
| NetLog* net_log);
|
|
|
| ~TransportClientSocketPool() override;
|
| @@ -283,9 +288,13 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool {
|
| : public PoolBase::ConnectJobFactory {
|
| public:
|
| TransportConnectJobFactory(ClientSocketFactory* client_socket_factory,
|
| - HostResolver* host_resolver,
|
| - NetLog* net_log)
|
| + const SocketPerformanceWatcherFactory*
|
| + socket_performance_watcher_factory,
|
| + HostResolver* host_resolver,
|
| + NetLog* net_log)
|
| : client_socket_factory_(client_socket_factory),
|
| + socket_performance_watcher_factory_(
|
| + socket_performance_watcher_factory),
|
| host_resolver_(host_resolver),
|
| net_log_(net_log) {}
|
|
|
| @@ -302,6 +311,7 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool {
|
|
|
| private:
|
| ClientSocketFactory* const client_socket_factory_;
|
| + const SocketPerformanceWatcherFactory* socket_performance_watcher_factory_;
|
| HostResolver* const host_resolver_;
|
| NetLog* net_log_;
|
|
|
|
|