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

ppapi/shared_impl/video_decoder_impl.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_SHARED_IMPL_VIDEO_DECODER_IMPL_H_
 #define PPAPI_SHARED_IMPL_VIDEO_DECODER_IMPL_H_
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
-#include "ppapi/shared_impl/resource_object_base.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_video_decoder_api.h"
 
 namespace gpu {
 namespace gles2 {
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
 namespace ppapi {
 namespace thunk {
@@ skipping 29 matching lines @@
   void RunBitstreamBufferCallback(int32 bitstream_buffer_id, int32 result);
 
   // Tell command buffer to process all commands it has received so far.
   void FlushCommandBuffer();
 
   // Initialize the underlying decoder and return success status.
   virtual bool Init(PP_Resource context3d_id,
                     thunk::PPB_Context3D_API* context,
                     const PP_VideoConfigElement* dec_config);
 
-  // TODO(fischman/vrk): Remove accordingly when brettw has merged resource
-  // trackers.
-  virtual void AddRefResource(PP_Resource resource) = 0;
-  virtual void UnrefResource(PP_Resource resource) = 0;
-
  private:
   // Key: bitstream_buffer_id, value: callback to run when bitstream decode is
   // done.
   typedef std::map<int32, PP_CompletionCallback> CallbackById;
 
   PP_CompletionCallback flush_callback_;
   PP_CompletionCallback reset_callback_;
   CallbackById bitstream_buffer_callbacks_;
 
   // The resource ID of the underlying Context3d object being used.  Used only
   // for reference counting to keep it alive for the lifetime of |*this|.
   PP_Resource context3d_id_;
 
   // Reference to the GLES2Implementation owned by |context3d_id_|.
   // Context3D is guaranteed to be alive for the lifetime of this class.
   // In the out-of-process case, Context3D's gles2_impl() exists in the plugin
   // process only, so gles2_impl_ is NULL in that case.
   gpu::gles2::GLES2Implementation* gles2_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderImpl);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_VIDEO_DECODER_IMPL_H_