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

ppapi/proxy/ppb_file_chooser_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_file_chooser_proxy.h"
 
 #include <queue>
 
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_proxy_private.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_file_ref_proxy.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::PPB_FileChooser_API;
 
 namespace pp {
 namespace proxy {
 
-class FileChooser : public PluginResource,
+class FileChooser : public Resource,
                     public PPB_FileChooser_API {
  public:
   FileChooser(const HostResource& resource);
   virtual ~FileChooser();
 
-  // ResourceObjectBase overrides.
+  // Resource overrides.
   virtual PPB_FileChooser_API* AsPPB_FileChooser_API() OVERRIDE;
 
   // PPB_FileChooser_API implementation.
   virtual int32_t Show(PP_CompletionCallback callback) OVERRIDE;
   virtual PP_Resource GetNextChosenFile() OVERRIDE;
 
   // Handles the choose complete notification from the host.
   void ChooseComplete(
     int32_t result_code,
     const std::vector<PPBFileRef_CreateInfo>& chosen_files);
 
  private:
   PP_CompletionCallback current_show_callback_;
 
   // All files returned by the current show callback that haven't yet been
   // given to the plugin. The plugin will repeatedly call us to get the next
   // file, and we'll vend those out of this queue, removing them when ownership
   // has transferred to the plugin.
   std::queue<PP_Resource> file_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(FileChooser);
 };
 
 FileChooser::FileChooser(const HostResource& resource)
-    : PluginResource(resource),
+    : Resource(resource),
       current_show_callback_(PP_MakeCompletionCallback(NULL, NULL)) {
 }
 
 FileChooser::~FileChooser() {
   // Always need to fire completion callbacks to prevent a leak in the plugin.
   if (current_show_callback_.func) {
     // TODO(brettw) the callbacks at this level should be refactored with a
     // more automatic tracking system like we have in the renderer.
     MessageLoop::current()->PostTask(FROM_HERE, NewRunnableFunction(
         current_show_callback_.func, current_show_callback_.user_data,
@@ skipping 11 matching lines @@
 
 PPB_FileChooser_API* FileChooser::AsPPB_FileChooser_API() {
   return this;
 }
 
 int32_t FileChooser::Show(PP_CompletionCallback callback) {
   if (current_show_callback_.func)
     return PP_ERROR_INPROGRESS;  // Can't show more than once.
 
   current_show_callback_ = callback;
-  GetDispatcher()->Send(new PpapiHostMsg_PPBFileChooser_Show(
-      INTERFACE_ID_PPB_FILE_CHOOSER, host_resource()));
+  PluginDispatcher::GetForResource(this)->Send(
+      new PpapiHostMsg_PPBFileChooser_Show(
+          INTERFACE_ID_PPB_FILE_CHOOSER, host_resource()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 PP_Resource FileChooser::GetNextChosenFile() {
   if (file_queue_.empty())
     return 0;
 
   // Return the next resource in the queue. These resource have already been
   // addrefed (they're currently owned by the FileChooser) and returning them
   // transfers ownership of that reference to the plugin.
@@ skipping 55 matching lines @@
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBFileChooser_Create(
       INTERFACE_ID_PPB_FILE_CHOOSER, instance,
       options->mode,
       options->accept_mime_types ? options->accept_mime_types : std::string(),
       &result));
 
   if (result.is_null())
     return 0;
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new FileChooser(result));
+  return (new FileChooser(result))->GetReference();
 }
 
 bool PPB_FileChooser_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_FileChooser_Proxy, msg)
     // Plugin -> host messages.
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFileChooser_Create, OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFileChooser_Show, OnMsgShow)
 
     // Host -> plugin messages.
@@ skipping 54 matching lines @@
       files.push_back(cur_create_info);
     }
   }
 
   dispatcher()->Send(new PpapiMsg_PPBFileChooser_ChooseComplete(
       INTERFACE_ID_PPB_FILE_CHOOSER, chooser, result, files));
 }
 
 }  // namespace proxy
 }  // namespace pp