Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_graphics_2d_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_2D_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_2D_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_graphics_2d.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_graphics_2d_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
-#include "webkit/plugins/ppapi/resource.h"
 
 struct PPB_Graphics2D;
 
 namespace gfx {
 class Rect;
 }
 
 namespace webkit {
 namespace ppapi {
 
 class PPB_ImageData_Impl;
 class PluginInstance;
 class PluginModule;
 
-class PPB_Graphics2D_Impl
-    : public Resource,
-      public ::ppapi::thunk::PPB_Graphics2D_API {
+class PPB_Graphics2D_Impl : public ::ppapi::Resource,
+                            public ::ppapi::thunk::PPB_Graphics2D_API {
  public:
   virtual ~PPB_Graphics2D_Impl();
 
-  static PP_Resource Create(PluginInstance* instance,
+  static PP_Resource Create(PP_Instance instance,
                             const PP_Size& size,
                             PP_Bool is_always_opaque);
 
   bool is_always_opaque() const { return is_always_opaque_; }
 
   virtual ::ppapi::thunk::PPB_Graphics2D_API* AsPPB_Graphics2D_API();
 
   // Resource override.
   virtual PPB_Graphics2D_Impl* AsPPB_Graphics2D_Impl();
 
@@ skipping 21 matching lines @@
 
   // Notifications that the view has rendered the page and that it has been
   // flushed to the screen. These messages are used to send Flush callbacks to
   // the plugin. See
   void ViewInitiatedPaint();
   void ViewFlushedPaint();
 
   PPB_ImageData_Impl* image_data() { return image_data_.get(); }
 
  private:
-  explicit PPB_Graphics2D_Impl(PluginInstance* instance);
+  explicit PPB_Graphics2D_Impl(PP_Instance instance);
 
   bool Init(int width, int height, bool is_always_opaque);
 
   // Tracks a call to flush that requires a callback.
   class FlushCallbackData {
    public:
     FlushCallbackData() {
       Clear();
     }
 
@@ skipping 86 matching lines @@
   // This allows us to do more optimized painting in some cases.
   bool is_always_opaque_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Graphics2D_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_2D_IMPL_H_