Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/ppb_flash_menu_proxy.cc

 // Copyright (c) 2011 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_menu_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash_menu.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ skipping 59 matching lines @@
   return PP_OK_COMPLETIONPENDING;
 }
 
 void FlashMenu::ShowACK(int32_t selected_id, int32_t result) {
   *selected_id_ptr_ = selected_id;
   PP_RunAndClearCompletionCallback(&callback_, result);
 }
 
 namespace {
 
-InterfaceProxy* CreateFlashMenuProxy(Dispatcher* dispatcher) {
-  return new PPB_Flash_Menu_Proxy(dispatcher);
+InterfaceProxy* CreateFlashMenuProxy(Dispatcher* dispatcher,
+                                     const void* target_interface) {
+  return new PPB_Flash_Menu_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
+PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher,
+                                           const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 PPB_Flash_Menu_Proxy::~PPB_Flash_Menu_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_Flash_Menu_Proxy::GetInfo() {
   static const Info info = {
     ppapi::thunk::GetPPB_Flash_Menu_Thunk(),
@@ skipping 37 matching lines @@
                         OnMsgShowACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   // FIXME(brettw) handle bad messages!
   return handled;
 }
 
 void PPB_Flash_Menu_Proxy::OnMsgCreate(PP_Instance instance,
                                        const SerializedFlashMenu& menu_data,
                                        HostResource* result) {
-  thunk::EnterResourceCreation enter(instance);
+  EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true);
   if (enter.succeeded()) {
     result->SetHostResource(
         instance,
         enter.functions()->CreateFlashMenu(instance, menu_data.pp_menu()));
   }
 }
 
 struct PPB_Flash_Menu_Proxy::ShowRequest {
   HostResource menu;
   int32_t selected_id;
@@ skipping 28 matching lines @@
   dispatcher()->Send(new PpapiMsg_PPBFlashMenu_ShowACK(
       INTERFACE_ID_PPB_FLASH_MENU,
       request->menu,
       request->selected_id,
       result));
   delete request;
 }
 
 }  // namespace proxy
 }  // namespace ppapi