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

ppapi/proxy/ppb_video_capture_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_video_capture_proxy.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/dev/ppb_video_capture_dev.h"
 #include "ppapi/c/dev/ppp_video_capture_dev.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_buffer_proxy.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
 #include "ppapi/thunk/ppb_buffer_trusted_api.h"
 #include "ppapi/thunk/ppb_video_capture_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
 using ppapi::thunk::PPB_BufferTrusted_API;
 using ppapi::thunk::PPB_VideoCapture_API;
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
@@ skipping 100 matching lines @@
 PPP_VideoCapture_Dev ppp_video_capture = {
   OnDeviceInfo,
   OnStatus,
   OnError,
   OnBufferReady
 };
 
 }  // namespace
 
 class VideoCapture : public ppapi::thunk::PPB_VideoCapture_API,
-                     public PluginResource {
+                     public Resource {
  public:
   VideoCapture(const HostResource& resource);
   virtual ~VideoCapture();
 
-  // ResourceObjectBase overrides.
+  // Resource overrides.
   virtual ppapi::thunk::PPB_VideoCapture_API* AsPPB_VideoCapture_API() OVERRIDE;
 
   // PPB_VideoCapture_API implementation.
   virtual int32_t StartCapture(
       const PP_VideoCaptureDeviceInfo_Dev& requested_info,
       uint32_t buffer_count) {
     switch (status_) {
       case PP_VIDEO_CAPTURE_STATUS_STARTING:
       case PP_VIDEO_CAPTURE_STATUS_STARTED:
       case PP_VIDEO_CAPTURE_STATUS_PAUSED:
@@ skipping 75 matching lines @@
 
   void SetBufferCount(size_t count) {
     buffer_in_use_ = std::vector<bool>(count);
   }
   void SetBufferInUse(uint32_t buffer) {
     DCHECK(buffer < buffer_in_use_.size());
     buffer_in_use_[buffer] = true;
   }
 
  private:
+  PluginDispatcher* GetDispatcher() const {
+    return PluginDispatcher::GetForResource(this);
+  }
+
   uint32_t status_;
   std::vector<bool> buffer_in_use_;
   DISALLOW_COPY_AND_ASSIGN(VideoCapture);
 };
 
 VideoCapture::VideoCapture(const HostResource& resource)
-    : PluginResource(resource),
+    : Resource(resource),
       status_(PP_VIDEO_CAPTURE_STATUS_STOPPED) {
 }
 
 VideoCapture::~VideoCapture() {
 }
 
 ppapi::thunk::PPB_VideoCapture_API* VideoCapture::AsPPB_VideoCapture_API() {
   return this;
 }
 
@@ skipping 21 matching lines @@
 PP_Resource PPB_VideoCapture_Proxy::CreateProxyResource(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBVideoCapture_Create(
       INTERFACE_ID_PPB_VIDEO_CAPTURE_DEV, instance, &result));
   if (result.is_null())
     return 0;
-
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new VideoCapture(result));
+  return (new VideoCapture(result))->GetReference();
 }
 
 bool PPB_VideoCapture_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_VideoCapture_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBVideoCapture_Create, OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBVideoCapture_StartCapture,
                         OnMsgStartCapture)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBVideoCapture_ReuseBuffer,
                         OnMsgReuseBuffer)
@@ skipping 134 matching lines @@
   PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
   if (!resource || !ppp_video_capture_target() || enter.failed())
     return;
   static_cast<VideoCapture*>(enter.object())->SetBufferInUse(buffer);
   ppp_video_capture_target()->OnBufferReady(
       host_resource.instance(), resource, buffer);
 }
 
 }  // namespace proxy
 }  // namespace pp