| Index: net/socket/tcp_socket_win.cc
|
| diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc
|
| index 1ca554842c5c109fd2d20a111790e1f70daa9cb1..f96d678c6aeed7ef3b7aa8ddcd25e0f05bcbe922 100644
|
| --- a/net/socket/tcp_socket_win.cc
|
| +++ b/net/socket/tcp_socket_win.cc
|
| @@ -284,7 +284,7 @@ int TCPSocketWin::Open(AddressFamily family) {
|
| return OK;
|
| }
|
|
|
| -int TCPSocketWin::AdoptConnectedSocket(SOCKET socket,
|
| +int TCPSocketWin::AdoptConnectedSocket(SocketDescriptor socket,
|
| const IPEndPoint& peer_address) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK_EQ(socket_, INVALID_SOCKET);
|
| @@ -305,7 +305,7 @@ int TCPSocketWin::AdoptConnectedSocket(SOCKET socket,
|
| return OK;
|
| }
|
|
|
| -int TCPSocketWin::AdoptListenSocket(SOCKET socket) {
|
| +int TCPSocketWin::AdoptUnconnectedSocket(SocketDescriptor socket) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK_EQ(socket_, INVALID_SOCKET);
|
|
|
| @@ -729,6 +729,13 @@ void TCPSocketWin::EndLoggingMultipleConnectAttempts(int net_error) {
|
| }
|
| }
|
|
|
| +SocketDescriptor TCPSocketWin::ReleaseSocketDescriptorForTesting() {
|
| + SocketDescriptor socket_descriptor = socket_;
|
| + socket_ = INVALID_SOCKET;
|
| + Close();
|
| + return socket_descriptor;
|
| +}
|
| +
|
| int TCPSocketWin::AcceptInternal(std::unique_ptr<TCPSocketWin>* socket,
|
| IPEndPoint* address) {
|
| SockaddrStorage storage;
|
|
|