Move server socket functionality from TCPServerSocket into TCPSocket.

net/socket/tcp_server_socket.h

Index: net/socket/tcp_server_socket.h
diff --git a/net/socket/tcp_server_socket.h b/net/socket/tcp_server_socket.h
index 4970a150e8d64cf7b100996aa08b3462be904659..6d818c68996c35cccce8cc0edf66dfdf117bf271 100644
--- a/net/socket/tcp_server_socket.h
+++ b/net/socket/tcp_server_socket.h
@@ -5,21 +5,42 @@
 #ifndef NET_SOCKET_TCP_SERVER_SOCKET_H_
 #define NET_SOCKET_TCP_SERVER_SOCKET_H_
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include "net/socket/tcp_server_socket_win.h"
-#elif defined(OS_POSIX)
-#include "net/socket/tcp_server_socket_libevent.h"
-#endif
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "net/base/ip_endpoint.h"
+#include "net/base/net_export.h"
+#include "net/base/net_log.h"
+#include "net/socket/server_socket.h"
+#include "net/socket/tcp_socket.h"
 
 namespace net {
 
-#if defined(OS_WIN)
-typedef TCPServerSocketWin TCPServerSocket;
-#elif defined(OS_POSIX)
-typedef TCPServerSocketLibevent TCPServerSocket;
-#endif
+class NET_EXPORT_PRIVATE TCPServerSocket : public ServerSocket {
+ public:
+  TCPServerSocket(NetLog* net_log, const NetLog::Source& source);
+  virtual ~TCPServerSocket();
+
+  // net::ServerSocket implementation.
+  virtual int Listen(const IPEndPoint& address, int backlog) OVERRIDE;
+  virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
+  virtual int Accept(scoped_ptr<StreamSocket>* socket,
+                     const CompletionCallback& callback) OVERRIDE;
+
+ private:
+  // Completion callback for calling TCPSocket::Accept(). It converts the output
+  // of TCPSocket::Accept() to that of TCPServerSocket::Accept().
+  void OnAcceptCompleted(scoped_ptr<StreamSocket>* output_accepted_socket,

[akalin, 2013/08/26 23:48:51]

put output param last (and probably don't need to prepend output_)

[yzshen1, 2013/08/27 17:36:56]

We cannot, because we use this method in a base::Bind() and
|output_accepted_socket| and |forward_callback| are bound first.

If I change |output_accepted_socket| to |accepted_socket|, it will be too
similar to |accepted_socket_|, right? I wish I could leave it as it is.

What do you think?

On 2013/08/26 23:48:51, akalin wrote:

+                         const CompletionCallback& forward_callback,
+                         int result);
+  TCPSocket socket_;
+
+  scoped_ptr<TCPSocket> accepted_socket_;
+  IPEndPoint accepted_address_;
+  bool pending_accept_;
+
+  DISALLOW_COPY_AND_ASSIGN(TCPServerSocket);
+};
 
 }  // namespace net