Adds a method to TCPServerSocket to adopt a socket.

net/socket/tcp_socket_win.h

 // 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.
 
 #ifndef NET_SOCKET_TCP_SOCKET_WIN_H_
 #define NET_SOCKET_TCP_SOCKET_WIN_H_
 
 #include <stdint.h>
 #include <winsock2.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/win/object_watcher.h"
 #include "net/base/address_family.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/log/net_log_with_source.h"
+#include "net/socket/socket_descriptor.h"
 #include "net/socket/socket_performance_watcher.h"
 
 namespace net {
 
 class AddressList;
 class IOBuffer;
 class IPEndPoint;
 class NetLog;
 struct NetLogSource;
 
 class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
                                 public base::win::ObjectWatcher::Delegate  {
  public:
   TCPSocketWin(
       std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
       NetLog* net_log,
       const NetLogSource& source);
   ~TCPSocketWin() override;
 
   int Open(AddressFamily family);
 
-  // Both AdoptConnectedSocket and AdoptListenSocket take ownership of an
-  // existing socket. AdoptConnectedSocket takes an already connected
-  // socket. AdoptListenSocket takes a socket that is intended to accept
-  // connection. In some sense, AdoptListenSocket is more similar to Open.
-  int AdoptConnectedSocket(SOCKET socket, const IPEndPoint& peer_address);
-  int AdoptListenSocket(SOCKET socket);
+  // Takes ownership of |socket|, which is known to already be connected to the
+  // given peer address. However, peer address may be the empty address, for
+  // compatibility. The given peer address will be returned by GetPeerAddress.
+  int AdoptConnectedSocket(SocketDescriptor socket,
+                           const IPEndPoint& peer_address);
+  // Takes ownership of |socket|, which may or may not be open, bound, or
+  // listening. The caller must determine the state of the socket based on its
+  // provenance and act accordingly. The socket may have connections waiting
+  // to be accepted, but must not be actually connected.
+  int AdoptUnconnectedSocket(SocketDescriptor socket);
 
   int Bind(const IPEndPoint& address);
 
   int Listen(int backlog);
   int Accept(std::unique_ptr<TCPSocketWin>* socket,
              IPEndPoint* address,
              const CompletionCallback& callback);
 
   int Connect(const IPEndPoint& address, const CompletionCallback& callback);
   bool IsConnected() const;
@@ skipping 49 matching lines @@
   // NetLogEventType::TCP_CONNECT. These methods set the start/end of
   // NetLogEventType::TCP_CONNECT.
   //
   // TODO(yzshen): Change logging format and let TCPClientSocket log the
   // start/end of a series of connect attempts itself.
   void StartLoggingMultipleConnectAttempts(const AddressList& addresses);
   void EndLoggingMultipleConnectAttempts(int net_error);
 
   const NetLogWithSource& net_log() const { return net_log_; }
 
+  // Return the underlying SocketDescriptor and clean up this object, which may
+  // no longer be used. This method should be used only for testing. No read,
+  // write, or accept operations should be pending.
+  SocketDescriptor ReleaseSocketDescriptorForTesting();
+
  private:
   class Core;
 
   // base::ObjectWatcher::Delegate implementation.
   void OnObjectSignaled(HANDLE object) override;
 
   int AcceptInternal(std::unique_ptr<TCPSocketWin>* socket,
                      IPEndPoint* address);
 
   int DoConnect();
@@ skipping 47 matching lines @@
   bool logging_multiple_connect_attempts_;
 
   NetLogWithSource net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPSocketWin);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_TCP_SOCKET_WIN_H_