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

ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc

 // Copyright (c) 2012 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 "ppapi/proxy/ppb_tcp_server_socket_private_proxy.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 10 matching lines @@
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 class TCPServerSocket : public PPB_TCPServerSocket_Shared {
  public:
   TCPServerSocket(const HostResource& resource, uint32 plugin_dispatcher_id);
   virtual ~TCPServerSocket();
 
-  virtual void OnAcceptCompleted(
+  void OnAcceptCompleted(
       bool succeeded,
       uint32 tcp_socket_id,
       const PP_NetAddress_Private& local_addr,
-      const PP_NetAddress_Private& remote_addr) OVERRIDE;
+      const PP_NetAddress_Private& remote_addr);
 
   virtual void SendListen(const PP_NetAddress_Private& addr,
                           int32_t backlog) OVERRIDE;
   virtual void SendAccept() OVERRIDE;
   virtual void SendStopListening() OVERRIDE;
 
  private:
   void SendToBrowser(IPC::Message* msg);
 
   uint32 plugin_dispatcher_id_;
@@ skipping 123 matching lines @@
       id_to_server_socket_[socket_id] = server_socket;
     server_socket->OnListenCompleted(socket_id, local_addr, status);
   } else if (socket_id != 0 && status == PP_OK) {
     IPC::Message* msg =
         new PpapiHostMsg_PPBTCPServerSocket_Destroy(socket_id);
     PluginGlobals::Get()->GetBrowserSender()->Send(msg);
   }
 }
 
 void PPB_TCPServerSocket_Private_Proxy::OnMsgAcceptACK(
-    uint32 plugin_dispatcher_id,
+    int32 socket_routing_id,
     uint32 server_socket_id,
     uint32 accepted_socket_id,
     const PP_NetAddress_Private& local_addr,
     const PP_NetAddress_Private& remote_addr) {
   IDToServerSocketMap::iterator it =
       id_to_server_socket_.find(server_socket_id);
   if (it != id_to_server_socket_.end()) {
     bool succeeded = (accepted_socket_id != 0);
-    it->second->OnAcceptCompleted(succeeded,
-                                  accepted_socket_id,
-                                  local_addr,
-                                  remote_addr);
+    TCPServerSocket* socket = static_cast<TCPServerSocket*>(it->second);

[dmichael (off chromium), 2013/08/01 22:43:01]

suggestion: You could DCHECK(PpapiGlobals::Get()->IsHostGlobals()); to make sure
this cast is safe.

+    socket->OnAcceptCompleted(succeeded,
+                              accepted_socket_id,
+                              local_addr,
+                              remote_addr);
   } else if (accepted_socket_id != 0) {
     PluginGlobals::Get()->GetBrowserSender()->Send(
         new PpapiHostMsg_PPBTCPSocket_Disconnect(accepted_socket_id));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi