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

ppapi/proxy/ppb_font_proxy.h

 // 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.
 
 #ifndef PPAPI_PROXY_PPB_FONT_PROXY_H_
 #define PPAPI_PROXY_PPB_FONT_PROXY_H_
 
 #include "base/basictypes.h"
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "base/scoped_ptr.h"

[dmichael (off chromium), 2011/08/17 16:28:07]

These 3 look a little out-of-place here. Are these necessary? I don't see them
used in the header.

 #include "base/synchronization/waitable_event.h"
 #include "ppapi/proxy/interface_proxy.h"
-#include "ppapi/proxy/plugin_resource.h"
+#include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/host_resource.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/webkit_forwarding.h"
 #include "ppapi/thunk/ppb_font_api.h"
 
 struct PPB_Font_Dev;
 
 namespace pp {
 namespace proxy {
 
 class SerializedVarReturnValue;
 
@@ skipping 12 matching lines @@
   // PPB_Font_FunctionAPI implementation.
   virtual PP_Var GetFontFamilies(PP_Instance instance) OVERRIDE;
 
   // InterfaceProxy implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PPB_Font_Proxy);
 };
 
-class Font : public PluginResource,
+class Font : public ppapi::Resource,
              public ppapi::thunk::PPB_Font_API {
  public:
   // Note that there isn't a "real" resource in the renderer backing a font,
   // it lives entirely in the plugin process. So the resource ID in the host
   // resource should be 0. However, various code assumes the instance in the
   // host resource is valid (this is how resources are associated with
   // instances), so that should be set.
   Font(const ppapi::HostResource& resource, const PP_FontDescription_Dev& desc);
   virtual ~Font();
 
-  // ResourceObjectBase.
+  // Resource.
   virtual ppapi::thunk::PPB_Font_API* AsPPB_Font_API() OVERRIDE;
 
   // PPB_Font_API implementation.
   virtual PP_Bool Describe(PP_FontDescription_Dev* description,
                            PP_FontMetrics_Dev* metrics) OVERRIDE;
   virtual PP_Bool DrawTextAt(PP_Resource image_data,
                              const PP_TextRun_Dev* text,
                              const PP_Point* position,
                              uint32_t color,
                              const PP_Rect* clip,
@@ skipping 20 matching lines @@
   // destruction).
   ppapi::WebKitForwarding::Font* font_forwarding_;
 
   DISALLOW_COPY_AND_ASSIGN(Font);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_PPB_FONT_PROXY_H_