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

ppapi/proxy/ppb_instance_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_instance_proxy.h"
 
 #include "build/build_config.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_time.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
 #include "ppapi/c/ppb_mouse_lock.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/proxy/content_decryptor_private_serializer.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/flash_clipboard_resource.h"
 #include "ppapi/proxy/flash_resource.h"
 #include "ppapi/proxy/gamepad_resource.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_flash_proxy.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/ppb_url_util_shared.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 
@@ skipping 262 matching lines @@
 }
 
 PP_Var PPB_Instance_Proxy::GetFontFamilies(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_MakeUndefined();
 
   // Assume the font families don't change, so we can cache the result globally.
   CR_DEFINE_STATIC_LOCAL(std::string, families, ());
   if (families.empty()) {
-    PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+    PluginGlobals::Get()->GetBrowserSender()->Send(
         new PpapiHostMsg_PPBInstance_GetFontFamilies(&families));
   }
 
   return StringVar::StringToPPVar(families);
 }
 
 PP_Bool PPB_Instance_Proxy::SetFullscreen(PP_Instance instance,
                                           PP_Bool fullscreen) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_SetFullscreen(
@@ skipping 18 matching lines @@
 // singleton resource APIs.
 thunk::PPB_Flash_Functions_API* PPB_Instance_Proxy::GetFlashFunctionsAPI(
     PP_Instance instance) {
 #if !defined(OS_NACL) && !defined(NACL_WIN64)
   InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
       GetInstanceData(instance);
   if (!data)
     return NULL;
 
   if (!data->flash_resource.get()) {
-    Connection connection(
-        PluginGlobals::Get()->plugin_proxy_delegate()->GetBrowserSender(),
-        dispatcher());
+    Connection connection(PluginGlobals::Get()->GetBrowserSender(),
+                          dispatcher());
     data->flash_resource = new FlashResource(connection, instance);
   }
   return data->flash_resource.get();
 #else
   // Flash functions aren't implemented for nacl.
   NOTIMPLEMENTED();
   return NULL;
 #endif  // !defined(OS_NACL) && !defined(NACL_WIN64)
 }
 
 thunk::PPB_Flash_Clipboard_API* PPB_Instance_Proxy::GetFlashClipboardAPI(
     PP_Instance instance) {
 #if !defined(OS_NACL) && !defined(NACL_WIN64)
   InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
       GetInstanceData(instance);
   if (!data)
     return NULL;
 
   if (!data->flash_clipboard_resource.get()) {
-    Connection connection(
-        PluginGlobals::Get()->plugin_proxy_delegate()->GetBrowserSender(),
-        dispatcher());
+    Connection connection(PluginGlobals::Get()->GetBrowserSender(),
+                          dispatcher());
     data->flash_clipboard_resource =
         new FlashClipboardResource(connection, instance);
   }
   return data->flash_clipboard_resource.get();
 #else
   // Flash functions aren't implemented for nacl.
   NOTIMPLEMENTED();
   return NULL;
 #endif  // !defined(OS_NACL) && !defined(NACL_WIN64)
 }
 
 thunk::PPB_Gamepad_API* PPB_Instance_Proxy::GetGamepadAPI(
     PP_Instance instance) {
   InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
       GetInstanceData(instance);
   if (!data)
     return NULL;
 
   if (!data->gamepad_resource.get()) {
-    Connection connection(
-        PluginGlobals::Get()->plugin_proxy_delegate()->GetBrowserSender(),
-        dispatcher());
+    Connection connection(PluginGlobals::Get()->GetBrowserSender(),
+                          dispatcher());
     data->gamepad_resource = new GamepadResource(connection, instance);
   }
   return data->gamepad_resource.get();
 }
 
 int32_t PPB_Instance_Proxy::RequestInputEvents(PP_Instance instance,
                                                uint32_t event_classes) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_RequestInputEvents(
       API_ID_PPB_INSTANCE, instance, false, event_classes));
 
@@ skipping 790 matching lines @@
     PP_Instance instance) {
   InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
       GetInstanceData(instance);
   if (!data)
     return;  // Instance was probably deleted.
   data->should_do_request_surrounding_text = false;
 }
 
 }  // namespace proxy
 }  // namespace ppapi