| Index: net/socket/tcp_server_socket_win.h
|
| diff --git a/net/socket/tcp_server_socket_win.h b/net/socket/tcp_server_socket_win.h
|
| index fbe61fadaf4c18f0c5b636be70802a0ea27c9d1d..4200b4c6655e7dd36f608168b53456c63e0e96bc 100644
|
| --- a/net/socket/tcp_server_socket_win.h
|
| +++ b/net/socket/tcp_server_socket_win.h
|
| @@ -29,14 +29,14 @@ class TCPServerSocketWin : public ServerSocket,
|
| // net::ServerSocket implementation.
|
| virtual int Listen(const net::IPEndPoint& address, int backlog);
|
| virtual int GetLocalAddress(IPEndPoint* address) const;
|
| - virtual int Accept(scoped_ptr<ClientSocket>* socket,
|
| + virtual int Accept(scoped_ptr<StreamSocket>* socket,
|
| CompletionCallback* callback);
|
|
|
| // base::ObjectWatcher::Delegate implementation.
|
| virtual void OnObjectSignaled(HANDLE object);
|
|
|
| private:
|
| - int AcceptInternal(scoped_ptr<ClientSocket>* socket);
|
| + int AcceptInternal(scoped_ptr<StreamSocket>* socket);
|
| void Close();
|
|
|
| SOCKET socket_;
|
| @@ -44,7 +44,7 @@ class TCPServerSocketWin : public ServerSocket,
|
|
|
| base::win::ObjectWatcher accept_watcher_;
|
|
|
| - scoped_ptr<ClientSocket>* accept_socket_;
|
| + scoped_ptr<StreamSocket>* accept_socket_;
|
| CompletionCallback* accept_callback_;
|
|
|
| BoundNetLog net_log_;
|
|
|