Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_graphics_3d_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_GRAPHICS_3D_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_3D_IMPL_H_
 
 #include "base/memory/scoped_callback_factory.h"
 #include "ppapi/shared_impl/graphics_3d_impl.h"
+#include "ppapi/shared_impl/resource.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/ppapi/resource.h"
 
 namespace webkit {
 namespace ppapi {
 
-class PPB_Graphics3D_Impl : public Resource,
+class PPB_Graphics3D_Impl : public ::ppapi::Resource,
                             public ::ppapi::Graphics3DImpl {
  public:
   virtual ~PPB_Graphics3D_Impl();
 
-  static PP_Resource Create(PluginInstance* instance,
+  static PP_Resource Create(PP_Instance instance,
                             PP_Resource share_context,
                             const int32_t* attrib_list);
-  static PP_Resource CreateRaw(PluginInstance* instance,
+  static PP_Resource CreateRaw(PP_Instance instance,
                                PP_Resource share_context,
                                const int32_t* attrib_list);
 
   // Resource override.
   virtual ::ppapi::thunk::PPB_Graphics3D_API* AsPPB_Graphics3D_API() OVERRIDE;
 
   // PPB_Graphics3D_API trusted implementation.
   virtual PP_Bool InitCommandBuffer(int32_t size) OVERRIDE;
   virtual PP_Bool GetRingBuffer(int* shm_handle,
                                 uint32_t* shm_size) OVERRIDE;
@@ skipping 21 matching lines @@
   // the plugin.
   void ViewInitiatedPaint();
   void ViewFlushedPaint();
 
  protected:
   // ppapi::Graphics3DImpl overrides.
   virtual gpu::CommandBuffer* GetCommandBuffer() OVERRIDE;
   virtual int32 DoSwapBuffers() OVERRIDE;
 
  private:
-  explicit PPB_Graphics3D_Impl(PluginInstance* instance);
+  explicit PPB_Graphics3D_Impl(PP_Instance instance);
 
   bool Init(PP_Resource share_context,
             const int32_t* attrib_list);
   bool InitRaw(PP_Resource share_context,
                const int32_t* attrib_list);
 
   // Notifications received from the GPU process.
   void OnSwapBuffers();
   void OnContextLost();
   // Notifications sent to plugin.
   void SendContextLost();
 
   // True if context is bound to instance.
   bool bound_to_instance_;
   // True when waiting for compositor to commit our backing texture.
   bool commit_pending_;
   // PluginDelegate's 3D Context. Responsible for providing the command buffer.
   scoped_ptr<PluginDelegate::PlatformContext3D> platform_context_;
   base::ScopedCallbackFactory<PPB_Graphics3D_Impl> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_3D_IMPL_H_