| Index: net/socket/tcp_server_socket.cc
|
| diff --git a/net/socket/tcp_server_socket.cc b/net/socket/tcp_server_socket.cc
|
| index a25f73f6c6f2717d6af3c2ee6fa5cb4be2eca896..9273332e314d4ac86ca5199eacfa038724e6a99a 100644
|
| --- a/net/socket/tcp_server_socket.cc
|
| +++ b/net/socket/tcp_server_socket.cc
|
| @@ -13,8 +13,7 @@
|
| namespace net {
|
|
|
| TCPServerSocket::TCPServerSocket(NetLog* net_log, const NetLog::Source& source)
|
| - : socket_(net_log, source),
|
| - pending_accept_(false) {
|
| + : socket_(net_log, source), pending_accept_(false) {
|
| }
|
|
|
| TCPServerSocket::~TCPServerSocket() {
|
| @@ -63,10 +62,12 @@ int TCPServerSocket::Accept(scoped_ptr<StreamSocket>* socket,
|
| // It is safe to use base::Unretained(this). |socket_| is owned by this class,
|
| // and the callback won't be run after |socket_| is destroyed.
|
| CompletionCallback accept_callback =
|
| - base::Bind(&TCPServerSocket::OnAcceptCompleted, base::Unretained(this),
|
| - socket, callback);
|
| - int result = socket_.Accept(&accepted_socket_, &accepted_address_,
|
| - accept_callback);
|
| + base::Bind(&TCPServerSocket::OnAcceptCompleted,
|
| + base::Unretained(this),
|
| + socket,
|
| + callback);
|
| + int result =
|
| + socket_.Accept(&accepted_socket_, &accepted_address_, accept_callback);
|
| if (result != ERR_IO_PENDING) {
|
| // |accept_callback| won't be called so we need to run
|
| // ConvertAcceptedSocket() ourselves in order to do the conversion from
|
| @@ -87,8 +88,8 @@ int TCPServerSocket::ConvertAcceptedSocket(
|
| if (result != OK)
|
| return result;
|
|
|
| - output_accepted_socket->reset(new TCPClientSocket(
|
| - temp_accepted_socket.Pass(), accepted_address_));
|
| + output_accepted_socket->reset(
|
| + new TCPClientSocket(temp_accepted_socket.Pass(), accepted_address_));
|
|
|
| return OK;
|
| }
|
|
|