Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_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 WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/video_decoder_impl.h"
 #include "ppapi/thunk/ppb_video_decoder_api.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/ppapi/resource.h"
 
 struct PP_PictureBuffer_Dev;
 struct PP_VideoDecoderConfig_Dev;
 struct PP_VideoBitstreamBuffer_Dev;
 struct PPB_VideoDecoder_Dev;
 struct PPP_VideoDecoder_Dev;
 
 namespace gpu {
 namespace gles2 {
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
 namespace ppapi {
 namespace thunk {
 class PPB_Context3D_API;
 }  // namespace thunk
 }  // namespace ppapi
 
 
 namespace webkit {
 namespace ppapi {
 
-class PluginInstance;
-
-class PPB_VideoDecoder_Impl : public Resource,
+class PPB_VideoDecoder_Impl : public ::ppapi::Resource,
                               public ::ppapi::VideoDecoderImpl,
                               public media::VideoDecodeAccelerator::Client {
  public:
   virtual ~PPB_VideoDecoder_Impl();
   // See PPB_VideoDecoder_Dev::Create.  Returns 0 on failure to create &
   // initialize.
-  static PP_Resource Create(PluginInstance* instance,
+  static PP_Resource Create(PP_Instance instance,
                             PP_Resource context3d_id,
                             const PP_VideoConfigElement* config);
 
   // Resource overrides.
   virtual PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE;
 
   // PPB_VideoDecoder_API implementation.
   virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
                          PP_CompletionCallback callback) OVERRIDE;
   virtual void AssignPictureBuffers(
@@ skipping 16 matching lines @@
   virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) OVERRIDE;
   virtual void NotifyResetDone() OVERRIDE;
 
  protected:
   // VideoDecoderImpl implementation.
   virtual bool Init(PP_Resource context3d_id,
                     ::ppapi::thunk::PPB_Context3D_API* context,
                     const PP_VideoConfigElement* dec_config) OVERRIDE;
 
  private:
-  explicit PPB_VideoDecoder_Impl(PluginInstance* instance);
+  explicit PPB_VideoDecoder_Impl(PP_Instance instance);
 
   // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is
   // swapped with another.
   scoped_refptr<PluginDelegate::PlatformVideoDecoder> platform_video_decoder_;
 
   // Reference to the plugin requesting this interface.
   const PPP_VideoDecoder_Dev* ppp_videodecoder_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_