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

ppapi/proxy/ppb_pdf_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_pdf_proxy.h"
 
 #include <string.h>  // For memcpy.
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "build/build_config.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_pdf_api.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::PPB_PDFFont_API;
 using ppapi::thunk::EnterResource;
 
 namespace pp {
 namespace proxy {
 
-class PrivateFontFile : public PluginResource,
+class PrivateFontFile : public Resource,
                         public PPB_PDFFont_API {
  public:
-  PrivateFontFile(const HostResource& resource) : PluginResource(resource) {
+  PrivateFontFile(const HostResource& resource) : Resource(resource) {
   }
   virtual ~PrivateFontFile() {}
 
   PPB_PDFFont_API* AsPPB_PDFFont_API() { return this; }
 
   // Sees if we have a cache of the font table and returns a pointer to it.
   // Returns NULL if we don't have it.
   std::string* GetFontTable(uint32_t table) const;
 
   std::string* AddFontTable(uint32_t table, const std::string& contents);
@@ skipping 30 matching lines @@
     return 0;
 
   SerializedFontDescription desc;
   desc.SetFromPPFontDescription(dispatcher, *description, true);
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBPDF_GetFontFileWithFallback(
       INTERFACE_ID_PPB_PDF, instance, desc, charset, &result));
   if (result.is_null())
     return 0;
-
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new PrivateFontFile(result));
+  return (new PrivateFontFile(result))->GetReference();
 }
 
 bool GetFontTableForPrivateFontFile(PP_Resource font_file,
                                     uint32_t table,
                                     void* output,
                                     uint32_t* output_length) {
   EnterResource<PPB_PDFFont_API> enter(font_file, true);
   if (enter.failed())
     return false;
 
   PrivateFontFile* object = static_cast<PrivateFontFile*>(enter.object());
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
-      object->instance());
+      object->pp_instance());
   if (!dispatcher)
     return false;
 
   std::string* contents = object->GetFontTable(table);
   if (!contents) {
     std::string deserialized;
     dispatcher->Send(new PpapiHostMsg_PPBPDF_GetFontTableForPrivateFontFile(
         INTERFACE_ID_PPB_PDF, object->host_resource(), table, &deserialized));
     if (deserialized.empty())
       return false;
@@ skipping 76 matching lines @@
           font_file.host_resource(), table, NULL, &table_length))
     return;
 
   result->resize(table_length);
   ppb_pdf_target()->GetFontTableForPrivateFontFile(font_file.host_resource(),
       table, const_cast<char*>(result->c_str()), &table_length);
 }
 
 }  // namespace proxy
 }  // namespace pp