POSIX only: Move client socket functionality from TCPClientSocket into TCPSocket.

net/socket/tcp_server_socket.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/tcp_server_socket.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
-#include "build/build_config.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace net {
 
 TCPServerSocket::TCPServerSocket(NetLog* net_log, const NetLog::Source& source)
     : socket_(net_log, source),
       pending_accept_(false) {
 }
 
@@ skipping 60 matching lines @@
 }
 
 int TCPServerSocket::ConvertAcceptedSocket(
     int result,
     scoped_ptr<StreamSocket>* output_accepted_socket) {
   // Make sure the TCPSocket object is destroyed in any case.
   scoped_ptr<TCPSocket> temp_accepted_socket(accepted_socket_.Pass());
   if (result != OK)
     return result;
 
-  // TODO(yzshen): Once we switch TCPClientSocketLibevent to take a connected
-  // TCPSocket object, we don't need to do platform-specific handling.
-#if defined(OS_WIN)
   scoped_ptr<TCPClientSocket> client_socket(new TCPClientSocket(
       temp_accepted_socket.Pass(), accepted_address_));
-#elif defined(OS_POSIX)
-  scoped_ptr<TCPClientSocket> client_socket(new TCPClientSocket(
-      AddressList(accepted_address_),
-      temp_accepted_socket->net_log().net_log(),
-      temp_accepted_socket->net_log().source()));
-  int raw_socket = temp_accepted_socket->Release();
-  result = client_socket->AdoptSocket(raw_socket);
-  if (result != OK) {
-    // |client_socket| won't take ownership of |raw_socket| on failure.
-    // Therefore, we put it back into |temp_accepted_socket| to close it.
-    temp_accepted_socket->Adopt(raw_socket);
-    return result;
-  }
-#endif
 
   *output_accepted_socket = client_socket.Pass();

[akalin, 2013/09/05 22:58:12]

you can do:

output_accepted_socket->reset(new ...);

now

[yzshen1, 2013/09/06 17:19:45]

Done. Looks much better. :)

   return OK;
 }
 
 void TCPServerSocket::OnAcceptCompleted(
     scoped_ptr<StreamSocket>* output_accepted_socket,
     const CompletionCallback& forward_callback,
     int result) {
   result = ConvertAcceptedSocket(result, output_accepted_socket);
   pending_accept_ = false;
   forward_callback.Run(result);
 }
 
 }  // namespace net