| Index: net/socket/tcp_socket_win.cc
|
| diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc
|
| index 0d11a0d74438f07ca8af6cb14165fd16889e60bb..217fa66dd59d283f53b66c7af9e74fc7acc6d810 100644
|
| --- a/net/socket/tcp_socket_win.cc
|
| +++ b/net/socket/tcp_socket_win.cc
|
| @@ -242,9 +242,12 @@ void TCPSocketWin::Core::WriteDelegate::OnObjectSignaled(
|
|
|
| //-----------------------------------------------------------------------------
|
|
|
| -TCPSocketWin::TCPSocketWin(net::NetLog* net_log,
|
| - const net::NetLog::Source& source)
|
| - : socket_(INVALID_SOCKET),
|
| +TCPSocketWin::TCPSocketWin(
|
| + scoped_ptr<SocketPerformanceWatcher> socket_performance_watcher,
|
| + net::NetLog* net_log,
|
| + const net::NetLog::Source& source)
|
| + : socket_performance_watcher_(std::move(socket_performance_watcher)),
|
| + socket_(INVALID_SOCKET),
|
| accept_event_(WSA_INVALID_EVENT),
|
| accept_socket_(NULL),
|
| accept_address_(NULL),
|
| @@ -699,8 +702,8 @@ int TCPSocketWin::AcceptInternal(scoped_ptr<TCPSocketWin>* socket,
|
| net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, net_error);
|
| return net_error;
|
| }
|
| - scoped_ptr<TCPSocketWin> tcp_socket(new TCPSocketWin(
|
| - net_log_.net_log(), net_log_.source()));
|
| + scoped_ptr<TCPSocketWin> tcp_socket(
|
| + new TCPSocketWin(NULL, net_log_.net_log(), net_log_.source()));
|
| int adopt_result = tcp_socket->AdoptConnectedSocket(new_socket, ip_end_point);
|
| if (adopt_result != OK) {
|
| net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, adopt_result);
|
|
|