Add a unified resource tracker shared between the proxy and the impl.

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"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_flash_menu_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::EnterFunctionNoLock;
 using ppapi::thunk::PPB_Flash_Menu_API;
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace pp {
 namespace proxy {
 
-class FlashMenu : public PPB_Flash_Menu_API, public PluginResource {
+class FlashMenu : public PPB_Flash_Menu_API, public Resource {
  public:
   explicit FlashMenu(const HostResource& resource);
   virtual ~FlashMenu();
 
-  // ResourceObjectBase overrides.
+  // 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;
 
   void ShowACK(int32_t selected_id, int32_t result);
 
  private:
   PP_CompletionCallback callback_;
   int32_t* selected_id_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(FlashMenu);
 };
 
 FlashMenu::FlashMenu(const HostResource& resource)
-    : PluginResource(resource),
+    : Resource(resource),
       callback_(PP_BlockUntilComplete()),
       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) {
   if (callback_.func)
     return PP_ERROR_INPROGRESS;
 
   selected_id_ptr_ = selected_id;
   callback_ = callback;
 
-  GetDispatcher()->Send(new PpapiHostMsg_PPBFlashMenu_Show(
-      INTERFACE_ID_PPB_FLASH_MENU, host_resource(), *location));
+  PluginDispatcher::GetForResource(this)->Send(
+      new PpapiHostMsg_PPBFlashMenu_Show(
+          INTERFACE_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;
   PP_RunAndClearCompletionCallback(&callback_, result);
 }
 
 namespace {
 
@@ skipping 35 matching lines @@
 
   HostResource result;
   pp::proxy::SerializedFlashMenu serialized_menu;
   if (!serialized_menu.SetPPMenu(menu_data))
     return 0;
 
   dispatcher->Send(new PpapiHostMsg_PPBFlashMenu_Create(
       INTERFACE_ID_PPB_FLASH_MENU, instance_id, serialized_menu, &result));
   if (result.is_null())
     return 0;
-
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new FlashMenu(result));
+  return (new FlashMenu(result))->GetReference();
 }
 
 bool PPB_Flash_Menu_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Flash_Menu_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlashMenu_Create,
                         OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlashMenu_Show,
                         OnMsgShow)
 
@@ skipping 50 matching lines @@
   dispatcher()->Send(new PpapiMsg_PPBFlashMenu_ShowACK(
       INTERFACE_ID_PPB_FLASH_MENU,
       request->menu,
       request->selected_id,
       result));
   delete request;
 }
 
 }  // namespace proxy
 }  // namespace pp