Index: ppapi/proxy/ppb_flash_menu_proxy.cc |
diff --git a/ppapi/proxy/ppb_flash_menu_proxy.cc b/ppapi/proxy/ppb_flash_menu_proxy.cc |
index 5f6ff05a5d491012b387cc30187985ac319c4b83..fad568973276514da937c41b2ea1208096de28c0 100644 |
--- a/ppapi/proxy/ppb_flash_menu_proxy.cc |
+++ b/ppapi/proxy/ppb_flash_menu_proxy.cc |
@@ -77,16 +77,14 @@ void FlashMenu::ShowACK(int32_t selected_id, int32_t result) { |
namespace { |
-InterfaceProxy* CreateFlashMenuProxy(Dispatcher* dispatcher, |
- const void* target_interface) { |
- return new PPB_Flash_Menu_Proxy(dispatcher, target_interface); |
+InterfaceProxy* CreateFlashMenuProxy(Dispatcher* dispatcher) { |
+ return new PPB_Flash_Menu_Proxy(dispatcher); |
} |
} // namespace |
-PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher, |
- const void* target_interface) |
- : InterfaceProxy(dispatcher, target_interface), |
+PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher) |
+ : InterfaceProxy(dispatcher), |
callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { |
} |
@@ -144,7 +142,7 @@ bool PPB_Flash_Menu_Proxy::OnMessageReceived(const IPC::Message& msg) { |
void PPB_Flash_Menu_Proxy::OnMsgCreate(PP_Instance instance, |
const SerializedFlashMenu& menu_data, |
HostResource* result) { |
- EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true); |
+ thunk::EnterResourceCreation enter(instance); |
if (enter.succeeded()) { |
result->SetHostResource( |
instance, |