PPAPI: Make blocking completion callbacks work.

ppapi/proxy/ppb_flash_menu_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_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 13 matching lines @@
  public:
   explicit FlashMenu(const HostResource& resource);
   virtual ~FlashMenu();
 
   // Resource overrides.
   virtual PPB_Flash_Menu_API* AsPPB_Flash_Menu_API() OVERRIDE;
 
   // PPB_Flash_Menu_API implementation.
   virtual int32_t Show(const PP_Point* location,
                        int32_t* selected_id,
-                       PP_CompletionCallback callback) OVERRIDE;
+                       ApiCallbackType callback) OVERRIDE;
 
   void ShowACK(int32_t selected_id, int32_t result);
 
  private:
   scoped_refptr<TrackedCallback> callback_;
   int32_t* selected_id_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(FlashMenu);
 };
 
 FlashMenu::FlashMenu(const HostResource& resource)
     : Resource(OBJECT_IS_PROXY, resource),
       selected_id_ptr_(NULL) {
 }
 
 FlashMenu::~FlashMenu() {
 }
 
 PPB_Flash_Menu_API* FlashMenu::AsPPB_Flash_Menu_API() {
   return this;
 }
 
 int32_t FlashMenu::Show(const struct PP_Point* location,
                         int32_t* selected_id,
-                        struct PP_CompletionCallback callback) {
+                        ApiCallbackType callback) {
   if (TrackedCallback::IsPending(callback_))
     return PP_ERROR_INPROGRESS;
 
   selected_id_ptr_ = selected_id;
-  callback_ = new TrackedCallback(this, callback);
+  callback_ = callback;
 
   PluginDispatcher::GetForResource(this)->Send(
       new PpapiHostMsg_PPBFlashMenu_Show(
           API_ID_PPB_FLASH_MENU, host_resource(), *location));
   return PP_OK_COMPLETIONPENDING;
 }
 
 void FlashMenu::ShowACK(int32_t selected_id, int32_t result) {
   *selected_id_ptr_ = selected_id;
   TrackedCallback::ClearAndRun(&callback_, result);
@@ skipping 88 matching lines @@
   dispatcher()->Send(new PpapiMsg_PPBFlashMenu_ShowACK(
       API_ID_PPB_FLASH_MENU,
       request->menu,
       request->selected_id,
       result));
   delete request;
 }
 
 }  // namespace proxy
 }  // namespace ppapi