A few more cleanups to the pepper code. Dispatch IPCs in the sockets implementations directly by ha…

content/renderer/pepper/ppb_tcp_server_socket_private_impl.h

Index: content/renderer/pepper/ppb_tcp_server_socket_private_impl.h
===================================================================
--- content/renderer/pepper/ppb_tcp_server_socket_private_impl.h	(revision 214423)
+++ content/renderer/pepper/ppb_tcp_server_socket_private_impl.h	(working copy)
@@ -6,33 +6,42 @@
 #define CONTENT_RENDERER_PEPPER_PPB_TCP_SERVER_SOCKET_PRIVATE_IMPL_H_
 
 #include "base/compiler_specific.h"
+#include "ipc/ipc_listener.h"
 #include "ppapi/shared_impl/private/ppb_tcp_server_socket_shared.h"
 
 namespace content {
-class PepperHelperImpl;
 
 class PPB_TCPServerSocket_Private_Impl
-    : public ::ppapi::PPB_TCPServerSocket_Shared {
+    : public ::ppapi::PPB_TCPServerSocket_Shared,
+      public IPC::Listener {
  public:
   static PP_Resource CreateResource(PP_Instance instance);
 
-  virtual void OnAcceptCompleted(
-      bool succeeded,
-      uint32 accepted_socket_id,
-      const PP_NetAddress_Private& local_addr,
-      const PP_NetAddress_Private& remote_addr) OVERRIDE;
-
   virtual void SendListen(const PP_NetAddress_Private& addr,
                           int32_t backlog) OVERRIDE;
   virtual void SendAccept() OVERRIDE;
   virtual void SendStopListening() OVERRIDE;
 
  private:
-  PPB_TCPServerSocket_Private_Impl(PP_Instance instance);
+  explicit PPB_TCPServerSocket_Private_Impl(PP_Instance instance);
   virtual ~PPB_TCPServerSocket_Private_Impl();
 
-  PepperHelperImpl* GetHelper();
+  // IPC::Listener implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
+  void OnTCPServerSocketListenACK(uint32 plugin_dispatcher_id,
+                                  PP_Resource socket_resource,
+                                  uint32 socket_id,
+                                  const PP_NetAddress_Private& local_addr,
+                                  int32_t status);
+  void OnTCPServerSocketAcceptACK(int32 socket_routing_id,
+                                  uint32 socket_id,
+                                  uint32 accepted_socket_id,
+                                  const PP_NetAddress_Private& local_addr,
+                                  const PP_NetAddress_Private& remote_addr);
+
+  int routing_id_;
+
   DISALLOW_COPY_AND_ASSIGN(PPB_TCPServerSocket_Private_Impl);
 };