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

ppapi/proxy/ppb_flash_menu_proxy.cc

Index: ppapi/proxy/ppb_flash_menu_proxy.cc
===================================================================
--- ppapi/proxy/ppb_flash_menu_proxy.cc	(revision 100753)
+++ ppapi/proxy/ppb_flash_menu_proxy.cc	(working copy)
@@ -77,14 +77,16 @@
 
 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)) {
 }
 
@@ -142,7 +144,7 @@
 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,