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

content/browser/renderer_host/pepper/pepper_tcp_server_socket.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 "content/browser/renderer_host/pepper/pepper_tcp_server_socket.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
@@ skipping 78 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&PepperMessageFilter::RemoveTCPServerSocket, manager_,
                  socket_id_));
 }
 
 void PepperTCPServerSocket::SendAcceptACKError() {
   manager_->Send(new PpapiMsg_PPBTCPServerSocket_AcceptACK(
       routing_id_,
-      plugin_dispatcher_id_,
+      MSG_ROUTING_NONE,
       socket_id_,
       0,
       NetAddressPrivateImpl::kInvalidNetAddress,
       NetAddressPrivateImpl::kInvalidNetAddress));
 }
 
 void PepperTCPServerSocket::OnListenCompleted(int result) {
   DCHECK(state_ == LISTEN_IN_PROGRESS && socket_.get());
 
   if (result != net::OK) {
@@ skipping 50 matching lines @@
             &remote_addr)) {
       SendAcceptACKError();
     } else {
       uint32 accepted_socket_id =
           manager_->AddAcceptedTCPSocket(tcp_client_socket_routing_id,
                                          plugin_dispatcher_id_,
                                          socket.release());
       if (accepted_socket_id != 0) {
         manager_->Send(new PpapiMsg_PPBTCPServerSocket_AcceptACK(
             routing_id_,
-            plugin_dispatcher_id_,
+            tcp_client_socket_routing_id,
             socket_id_,
             accepted_socket_id,
             local_addr,
             remote_addr));
       } else {
         SendAcceptACKError();
       }
     }
   }
 
   state_ = LISTENING;
 }
 
 }  // namespace content