Pepper proxy: make the browser sender handle the proxy lock properly.

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"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
-#include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_tcp_socket_private_proxy.h"
 #include "ppapi/shared_impl/private/ppb_tcp_server_socket_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace proxy {
@@ skipping 82 matching lines @@
       InterfaceProxy* proxy =
           dispatcher->GetInterfaceProxy(API_ID_PPB_TCPSERVERSOCKET_PRIVATE);
       PPB_TCPServerSocket_Private_Proxy* server_socket_proxy =
           static_cast<PPB_TCPServerSocket_Private_Proxy*>(proxy);
       server_socket_proxy->ObjectDestroyed(socket_id_);
     }
   }
 }
 
 void TCPServerSocket::SendToBrowser(IPC::Message* msg) {
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(msg);
+  PluginGlobals::Get()->GetBrowserSender()->Send(msg);
 }
 
 }  // namespace
 
 //------------------------------------------------------------------------------
 
 PPB_TCPServerSocket_Private_Proxy::PPB_TCPServerSocket_Private_Proxy(
     Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher) {
 }
@@ skipping 37 matching lines @@
      enter(socket_resource, true);
   if (enter.succeeded()) {
     PPB_TCPServerSocket_Shared* server_socket =
         static_cast<PPB_TCPServerSocket_Shared*>(enter.object());
     if (status == PP_OK)
       id_to_server_socket_[socket_id] = server_socket;
     server_socket->OnListenCompleted(socket_id, status);
   } else if (socket_id != 0 && status == PP_OK) {
     IPC::Message* msg =
         new PpapiHostMsg_PPBTCPServerSocket_Destroy(socket_id);
-    PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(msg);
+    PluginGlobals::Get()->GetBrowserSender()->Send(msg);
   }
 }
 
 void PPB_TCPServerSocket_Private_Proxy::OnMsgAcceptACK(
     uint32 plugin_dispatcher_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);
   } else if (accepted_socket_id != 0) {
-    PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+    PluginGlobals::Get()->GetBrowserSender()->Send(
         new PpapiHostMsg_PPBTCPSocket_Disconnect(accepted_socket_id));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi