| Index: net/socket/tcp_client_socket.cc
|
| diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc
|
| index 78b24de7b15afe0c23c69089b8961ca471017b5c..39d4ceca04d400ceef5da9a7392dacaf5441904f 100644
|
| --- a/net/socket/tcp_client_socket.cc
|
| +++ b/net/socket/tcp_client_socket.cc
|
| @@ -13,18 +13,21 @@
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/net_util.h"
|
| +#include "net/base/socket_performance_watcher.h"
|
|
|
| namespace net {
|
|
|
| -TCPClientSocket::TCPClientSocket(const AddressList& addresses,
|
| - net::NetLog* net_log,
|
| - const net::NetLog::Source& source)
|
| - : socket_(new TCPSocket(net_log, source)),
|
| +TCPClientSocket::TCPClientSocket(
|
| + const AddressList& addresses,
|
| + scoped_ptr<SocketPerformanceWatcher> socket_performance_watcher,
|
| + net::NetLog* net_log,
|
| + const net::NetLog::Source& source)
|
| + : socket_(
|
| + new TCPSocket(socket_performance_watcher.Pass(), net_log, source)),
|
| addresses_(addresses),
|
| current_address_index_(-1),
|
| next_connect_state_(CONNECT_STATE_NONE),
|
| - previously_disconnected_(false) {
|
| -}
|
| + previously_disconnected_(false) {}
|
|
|
| TCPClientSocket::TCPClientSocket(scoped_ptr<TCPSocket> connected_socket,
|
| const IPEndPoint& peer_address)
|
|
|