Add DefaultListenSocket.

net/base/tcp_listen_socket.h

Index: net/base/tcp_listen_socket.h
diff --git a/net/base/tcp_listen_socket.h b/net/base/tcp_listen_socket.h
index ef3f3e6049c994481e57027475944cc1b89b5be4..c2620c10c8b1195747b9b3e29ba9877d122f4d6a 100644
--- a/net/base/tcp_listen_socket.h
+++ b/net/base/tcp_listen_socket.h
@@ -2,108 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TCP/IP server that handles IO asynchronously in the specified MessageLoop.
-// These objects are NOT thread safe.  They use WSAEVENT handles to monitor
-// activity in a given MessageLoop.  This means that callbacks will
-// happen in that loop's thread always and that all other methods (including
-// constructors and destructors) should also be called from the same thread.
-
 #ifndef NET_BASE_TCP_LISTEN_SOCKET_H_
 #define NET_BASE_TCP_LISTEN_SOCKET_H_
 #pragma once
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <winsock2.h>
-#endif
 #include <string>
-#if defined(OS_WIN)
-#include "base/win/object_watcher.h"
-#elif defined(OS_POSIX)
-#include "base/message_loop.h"
-#endif
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "net/base/listen_socket.h"
+#include "build/build_config.h"
 #include "net/base/net_export.h"
-
-#if defined(OS_POSIX)
-typedef int SOCKET;
-#endif
+#include "net/base/stream_listen_socket.h"
 
 namespace net {
 
-// Implements a TCP socket interface. Note that this is ref counted.
-class NET_EXPORT TCPListenSocket : public ListenSocket,
-#if defined(OS_WIN)
-                                   public base::win::ObjectWatcher::Delegate {
-#elif defined(OS_POSIX)
-                                   public MessageLoopForIO::Watcher {
-#endif
+// Implements a TCP socket. Note that this is ref counted.
+class NET_EXPORT TCPListenSocket : public StreamListenSocket {
  public:
   // Listen on port for the specified IP address.  Use 127.0.0.1 to only
   // accept local connections.
+  // Note that the deletion of the returned instance is under the
+  // responsibility of the caller.

[mmenke, 2012/04/30 19:11:44]

nit:  Think "The caller must take ownership of a pointer to the returned object"
is clearer.  Might also be a good idea to make it return a
scoped_refptr<TCPListenSocket> to make it even clearer.

[Philippe, 2012/05/03 14:27:52]

Done.

   static TCPListenSocket* CreateAndListen(const std::string& ip, int port,
-                                          ListenSocketDelegate* del);
-
-  // NOTE: This is for unit test use only!
-  // Pause/Resume calling Read().  Note that ResumeReads() will also call
-  // Read() if there is anything to read.
-  void PauseReads();
-  void ResumeReads();
-
+                                          StreamListenSocket::Delegate* del);
  protected:

[mmenke, 2012/04/30 19:11:44]

nit:  Line break needed above this line.

[Philippe, 2012/05/03 14:27:52]

Done.

-  enum WaitState {
-    NOT_WAITING      = 0,
-    WAITING_ACCEPT   = 1,
-    WAITING_READ     = 2
-  };
-
-  static const SOCKET kInvalidSocket;
-  static const int kSocketError;
-
-  TCPListenSocket(SOCKET s, ListenSocketDelegate* del);
+  TCPListenSocket(SOCKET s, StreamListenSocket::Delegate* del);
   virtual ~TCPListenSocket();
-  static SOCKET CreateAndBind(const std::string& ip, int port);
-  // if valid, returned SOCKET is non-blocking
-  static SOCKET Accept(SOCKET s);
-
-  // Implements ListenSocket::SendInternal.
-  virtual void SendInternal(const char* bytes, int len) OVERRIDE;
-
-  virtual void Listen();
-  virtual void Accept();
-  virtual void Read();
-  virtual void Close();
-  virtual void CloseSocket(SOCKET s);
 
-  // Pass any value in case of Windows, because in Windows
-  // we are not using state.
-  void WatchSocket(WaitState state);
-  void UnwatchSocket();
-
-#if defined(OS_WIN)
-  // ObjectWatcher delegate
-  virtual void OnObjectSignaled(HANDLE object);
-  base::win::ObjectWatcher watcher_;
-  HANDLE socket_event_;
-#elif defined(OS_POSIX)
-  // Called by MessagePumpLibevent when the socket is ready to do I/O
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
-  WaitState wait_state_;
-  // The socket's libevent wrapper
-  MessageLoopForIO::FileDescriptorWatcher watcher_;
-#endif
+  static SOCKET CreateAndBind(const std::string& ip, int port);
 
-  SOCKET socket_;
+  // Implements StreamListenSocket::Accept.
+  virtual void Accept() OVERRIDE;
 
  private:
-  bool reads_paused_;
-  bool has_pending_reads_;
-
   DISALLOW_COPY_AND_ASSIGN(TCPListenSocket);
 };