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

ppapi/proxy/ppb_file_system_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_system_proxy.h"
 
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_system.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/serialized_var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_system_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_FileSystem_API;
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
 InterfaceProxy* CreateFileSystemProxy(Dispatcher* dispatcher,
                                       const void* target_interface) {
   return new PPB_FileSystem_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
 // This object maintains most of the state of the ref in the plugin for fast
 // querying. It's all set in the constructor from the "create info" sent from
 // the host.
-class FileSystem : public PluginResource, public PPB_FileSystem_API {
+class FileSystem : public Resource, public PPB_FileSystem_API {
  public:
   FileSystem(const HostResource& host_resource, PP_FileSystemType type);
   virtual ~FileSystem();
 
-  // ResourceObjectBase override.
+  // Resource override.
   virtual PPB_FileSystem_API* AsPPB_FileSystem_API() OVERRIDE;
 
   // PPB_FileSystem_APi implementation.
   virtual int32_t Open(int64_t expected_size,
                        PP_CompletionCallback callback) OVERRIDE;
   virtual PP_FileSystemType GetType() OVERRIDE;
 
   // Called when the host has responded to our open request.
   void OpenComplete(int32_t result);
 
  private:
   PP_FileSystemType type_;
   bool called_open_;
   PP_CompletionCallback current_open_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };
 
 FileSystem::FileSystem(const HostResource& host_resource,
                        PP_FileSystemType type)
-    : PluginResource(host_resource),
+    : Resource(host_resource),
       type_(type),
       called_open_(false),
       current_open_callback_(PP_MakeCompletionCallback(NULL, NULL)) {
 }
 
 // TODO(brettw) this logic is duplicated with some other resource objects
 // like FileChooser. It would be nice to look at all of the different resources
 // that need callback tracking and design something that they can all re-use.
 FileSystem::~FileSystem() {
   // Ensure the callback is always fired.
@@ skipping 12 matching lines @@
 
 int32_t FileSystem::Open(int64_t expected_size,
                          PP_CompletionCallback callback) {
   if (current_open_callback_.func)
     return PP_ERROR_INPROGRESS;
   if (called_open_)
     return PP_ERROR_FAILED;
 
   current_open_callback_ = callback;
   called_open_ = true;
-  GetDispatcher()->Send(new PpapiHostMsg_PPBFileSystem_Open(
-      INTERFACE_ID_PPB_FILE_SYSTEM, host_resource(), expected_size));
+  PluginDispatcher::GetForResource(this)->Send(
+      new PpapiHostMsg_PPBFileSystem_Open(
+          INTERFACE_ID_PPB_FILE_SYSTEM, host_resource(), expected_size));
   return PP_OK_COMPLETIONPENDING;
 }
 
 PP_FileSystemType FileSystem::GetType() {
   return type_;
 }
 
 void FileSystem::OpenComplete(int32_t result) {
   PP_RunAndClearCompletionCallback(&current_open_callback_, result);
 }
@@ skipping 24 matching lines @@
     PP_FileSystemType type) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_ERROR_BADARGUMENT;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBFileSystem_Create(
       INTERFACE_ID_PPB_FILE_SYSTEM, instance, type, &result));
   if (result.is_null())
     return 0;
-
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new FileSystem(result, type));
+  return (new FileSystem(result, type))->GetReference();
 }
 
 bool PPB_FileSystem_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_FileSystem_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFileSystem_Create, OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFileSystem_Open, OnMsgOpen)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBFileSystem_OpenComplete, OnMsgOpenComplete)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 32 matching lines @@
 
 void PPB_FileSystem_Proxy::OpenCompleteInHost(
     int32_t result,
     const HostResource& host_resource) {
   dispatcher()->Send(new PpapiMsg_PPBFileSystem_OpenComplete(
       INTERFACE_ID_PPB_FILE_SYSTEM, host_resource, result));
 }
 
 }  // namespace proxy
 }  // namespace pp