| Index: net/socket/tcp_server_socket_win.cc
|
| diff --git a/net/socket/tcp_server_socket_win.cc b/net/socket/tcp_server_socket_win.cc
|
| index bfebff96461b725368a413b6aecec38b6b2ea927..bae18f2aab59b9c40de1883aa25840a8981df9b8 100644
|
| --- a/net/socket/tcp_server_socket_win.cc
|
| +++ b/net/socket/tcp_server_socket_win.cc
|
| @@ -99,7 +99,7 @@ int TCPServerSocketWin::GetLocalAddress(IPEndPoint* address) const {
|
| }
|
|
|
| int TCPServerSocketWin::Accept(
|
| - scoped_ptr<ClientSocket>* socket, CompletionCallback* callback) {
|
| + scoped_ptr<StreamSocket>* socket, CompletionCallback* callback) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(socket);
|
| DCHECK(callback);
|
| @@ -121,7 +121,7 @@ int TCPServerSocketWin::Accept(
|
| return result;
|
| }
|
|
|
| -int TCPServerSocketWin::AcceptInternal(scoped_ptr<ClientSocket>* socket) {
|
| +int TCPServerSocketWin::AcceptInternal(scoped_ptr<StreamSocket>* socket) {
|
| struct sockaddr_storage addr_storage;
|
| socklen_t addr_len = sizeof(addr_storage);
|
| struct sockaddr* addr = reinterpret_cast<struct sockaddr*>(&addr_storage);
|
|
|