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

ppapi/proxy/ppb_flash_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_flash_proxy.h"
 
 #include <math.h>
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/c/private/ppb_flash_print.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/pepper_file_messages.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
-#include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/proxy_module.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/dir_contents.h"
 #include "ppapi/shared_impl/file_type_conversion.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
@@ skipping 242 matching lines @@
 
 PP_Bool PPB_Flash_Proxy::IsRectTopmost(PP_Instance instance,
                                        const PP_Rect* rect) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBFlash_IsRectTopmost(
       API_ID_PPB_FLASH, instance, *rect, &result));
   return result;
 }
 
 void PPB_Flash_Proxy::UpdateActivity(PP_Instance instance) {
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  PluginGlobals::Get()->GetBrowserSender()->Send(
       new PpapiHostMsg_PPBFlash_UpdateActivity(API_ID_PPB_FLASH));
 }
 
 PP_Var PPB_Flash_Proxy::GetDeviceID(PP_Instance instance) {
   ReceiveSerializedVarReturnValue result;
   dispatcher()->Send(new PpapiHostMsg_PPBFlash_GetDeviceID(
       API_ID_PPB_FLASH, instance, &result));
   return result.Return(dispatcher());
 }
 
@@ skipping 23 matching lines @@
     case PP_FLASHSETTING_3DENABLED:
       return PP_MakeBool(PP_FromBool(
           plugin_dispatcher->preferences().is_3d_supported));
     case PP_FLASHSETTING_INCOGNITO:
       return PP_MakeBool(PP_FromBool(plugin_dispatcher->incognito()));
     case PP_FLASHSETTING_STAGE3DENABLED:
       return PP_MakeBool(PP_FromBool(
           plugin_dispatcher->preferences().is_stage3d_supported));
     case PP_FLASHSETTING_LANGUAGE:
       return StringVar::StringToPPVar(
-          PluginGlobals::Get()->plugin_proxy_delegate()->GetUILanguage());
+          PluginGlobals::Get()->GetUILanguage());
     case PP_FLASHSETTING_NUMCORES:
       return PP_MakeInt32(plugin_dispatcher->preferences().number_of_cpu_cores);
     case PP_FLASHSETTING_LSORESTRICTIONS: {
       ReceiveSerializedVarReturnValue result;
       dispatcher()->Send(new PpapiHostMsg_PPBFlash_GetSetting(
           API_ID_PPB_FLASH, instance, setting, &result));
       return result.Return(dispatcher());
     }
   }
   return PP_MakeUndefined();
 }
 
 PP_Bool PPB_Flash_Proxy::SetCrashData(PP_Instance instance,
                                       PP_FlashCrashKey key,
                                       PP_Var value) {
   switch (key) {
     case PP_FLASHCRASHKEY_URL:
       StringVar *url_string_var(StringVar::FromPPVar(value));
       if (!url_string_var)
         return PP_FALSE;
       std::string url_string(url_string_var->value());
-      PluginGlobals::Get()->plugin_proxy_delegate()->SetActiveURL(url_string);
+      PluginGlobals::Get()->SetActiveURL(url_string);
       return PP_TRUE;
   }
   return PP_FALSE;
 }
 
 bool PPB_Flash_Proxy::CreateThreadAdapterForInstance(PP_Instance instance) {
   return true;
 }
 
 void PPB_Flash_Proxy::ClearThreadAdapterForInstance(PP_Instance instance) {
 }
 
 int32_t PPB_Flash_Proxy::OpenFile(PP_Instance,
                                   const char* path,
                                   int32_t mode,
                                   PP_FileHandle* file) {
   int flags = 0;
   if (!path ||
       !ppapi::PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) ||
       !file)
     return PP_ERROR_BADARGUMENT;
 
   base::PlatformFileError error;
   IPC::PlatformFileForTransit transit_file;
   ppapi::PepperFilePath pepper_path(ppapi::PepperFilePath::DOMAIN_MODULE_LOCAL,
                                     FilePath::FromUTF8Unsafe(path));
 
-  if (PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  if (PluginGlobals::Get()->GetBrowserSender()->Send(
           new PepperFileMsg_OpenFile(pepper_path, flags,
                                      &error, &transit_file))) {
     *file = IPC::PlatformFileForTransitToPlatformFile(transit_file);
   } else {
     *file = base::kInvalidPlatformFileValue;
     error = base::PLATFORM_FILE_ERROR_FAILED;
   }
 
   return ppapi::PlatformFileErrorToPepperError(error);
 }
 
 int32_t PPB_Flash_Proxy::RenameFile(PP_Instance,
                                     const char* from_path,
                                     const char* to_path) {
   base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
   ppapi::PepperFilePath pepper_from(ppapi::PepperFilePath::DOMAIN_MODULE_LOCAL,
                                     FilePath::FromUTF8Unsafe(from_path));
   ppapi::PepperFilePath pepper_to(ppapi::PepperFilePath::DOMAIN_MODULE_LOCAL,
                                   FilePath::FromUTF8Unsafe(to_path));
 
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  PluginGlobals::Get()->GetBrowserSender()->Send(
       new PepperFileMsg_RenameFile(pepper_from, pepper_to, &error));
 
   return ppapi::PlatformFileErrorToPepperError(error);
 }
 
 int32_t PPB_Flash_Proxy::DeleteFileOrDir(PP_Instance,
                                          const char* path,
                                          PP_Bool recursive) {
   base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
   ppapi::PepperFilePath pepper_path(ppapi::PepperFilePath::DOMAIN_MODULE_LOCAL,
                                     FilePath::FromUTF8Unsafe(path));
 
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  PluginGlobals::Get()->GetBrowserSender()->Send(
       new PepperFileMsg_DeleteFileOrDir(pepper_path,
                                         PP_ToBool(recursive),
                                         &error));
 
   return ppapi::PlatformFileErrorToPepperError(error);
 }
 
 int32_t PPB_Flash_Proxy::CreateDir(PP_Instance, const char* path) {
   base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
   ppapi::PepperFilePath pepper_path(ppapi::PepperFilePath::DOMAIN_MODULE_LOCAL,
                                     FilePath::FromUTF8Unsafe(path));
 
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  PluginGlobals::Get()->GetBrowserSender()->Send(
       new PepperFileMsg_CreateDir(pepper_path, &error));
 
   return ppapi::PlatformFileErrorToPepperError(error);
 }
 
 int32_t PPB_Flash_Proxy::QueryFile(PP_Instance,
                                    const char* path,
                                    PP_FileInfo* info) {
   base::PlatformFileInfo file_info;
   base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
   ppapi::PepperFilePath pepper_path(ppapi::PepperFilePath::DOMAIN_MODULE_LOCAL,
                                     FilePath::FromUTF8Unsafe(path));
 
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  PluginGlobals::Get()->GetBrowserSender()->Send(
       new PepperFileMsg_QueryFile(pepper_path, &file_info, &error));
 
   if (error == base::PLATFORM_FILE_OK) {
     info->size = file_info.size;
     info->creation_time = TimeToPPTime(file_info.creation_time);
     info->last_access_time = TimeToPPTime(file_info.last_accessed);
     info->last_modified_time = TimeToPPTime(file_info.last_modified);
     info->system_type = PP_FILESYSTEMTYPE_EXTERNAL;
     if (file_info.is_directory)
         info->type = PP_FILETYPE_DIRECTORY;
     else
       info->type = PP_FILETYPE_REGULAR;
   }
 
   return ppapi::PlatformFileErrorToPepperError(error);
 }
 
 int32_t PPB_Flash_Proxy::GetDirContents(PP_Instance,
                                         const char* path,
                                         PP_DirContents_Dev** contents) {
   ppapi::DirContents entries;
   base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
   ppapi::PepperFilePath pepper_path(ppapi::PepperFilePath::DOMAIN_MODULE_LOCAL,
                                     FilePath::FromUTF8Unsafe(path));
 
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  PluginGlobals::Get()->GetBrowserSender()->Send(
       new PepperFileMsg_GetDirContents(pepper_path, &entries, &error));
 
   if (error == base::PLATFORM_FILE_OK) {
     // Copy the serialized dir entries to the output struct.
     *contents = new PP_DirContents_Dev;
     (*contents)->count = static_cast<int32_t>(entries.size());
     (*contents)->entries = new PP_DirEntry_Dev[entries.size()];
     for (size_t i = 0; i < entries.size(); i++) {
       const ppapi::DirEntry& source = entries[i];
       PP_DirEntry_Dev* dest = &(*contents)->entries[i];
       std::string name = source.name.AsUTF8Unsafe();
       char* name_copy = new char[name.size() + 1];
       memcpy(name_copy, name.c_str(), name.size() + 1);
       dest->name = name_copy;
       dest->is_dir = PP_FromBool(source.is_dir);
     }
   }
 
   return ppapi::PlatformFileErrorToPepperError(error);
 }
 
 int32_t PPB_Flash_Proxy::CreateTemporaryFile(PP_Instance instance,
                                              PP_FileHandle* file) {
   if (!file)
     return PP_ERROR_BADARGUMENT;
 
   base::PlatformFileError error;
   IPC::PlatformFileForTransit transit_file;
 
-  if (PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
+  if (PluginGlobals::Get()->GetBrowserSender()->Send(
           new PepperFileMsg_CreateTemporaryFile(&error, &transit_file))) {
     *file = IPC::PlatformFileForTransitToPlatformFile(transit_file);
   } else {
     error = base::PLATFORM_FILE_ERROR_FAILED;
     *file = base::kInvalidPlatformFileValue;
   }
 
   return ppapi::PlatformFileErrorToPepperError(error);
 }
 
@@ skipping 255 matching lines @@
   // It's rarely used enough that we just request this interface when needed.
   const PPB_Flash_Print_1_0* print_interface =
       static_cast<const PPB_Flash_Print_1_0*>(
           dispatcher()->local_get_interface()(PPB_FLASH_PRINT_INTERFACE_1_0));
   if (print_interface)
     print_interface->InvokePrinting(instance);
 }
 
 }  // namespace proxy
 }  // namespace ppapi