Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_context_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_CONTEXT_3D_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_CONTEXT_3D_IMPL_H_
 
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_context_3d_api.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/ppapi/resource.h"
 
 struct PPB_Context3DTrusted_Dev;
 
 namespace gpu {
 class CommandBuffer;
 namespace gles2 {
 class GLES2CmdHelper;
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
 namespace webkit {
 namespace ppapi {
 
 class PPB_Surface3D_Impl;
 
-class PPB_Context3D_Impl : public Resource,
+class PPB_Context3D_Impl : public ::ppapi::Resource,
                            public ::ppapi::thunk::PPB_Context3D_API {
  public:
   virtual ~PPB_Context3D_Impl();
 
   static PP_Resource Create(PP_Instance instance,
                             PP_Config3D_Dev config,
                             PP_Resource share_context,
                             const int32_t* attrib_list);
   static PP_Resource CreateRaw(PP_Instance instance,
                                PP_Config3D_Dev config,
@@ skipping 39 matching lines @@
   gpu::gles2::GLES2Implementation* gles2_impl() {
     return gles2_impl_.get();
   }
 
   // Possibly NULL if initialization fails.
   PluginDelegate::PlatformContext3D* platform_context() {
     return platform_context_.get();
   }
 
  private:
-  explicit PPB_Context3D_Impl(PluginInstance* instance);
+  explicit PPB_Context3D_Impl(PP_Instance instance);
 
   bool Init(PP_Config3D_Dev config,
             PP_Resource share_context,
             const int32_t* attrib_list);
   bool InitRaw(PP_Config3D_Dev config,
                PP_Resource share_context,
                const int32_t* attrib_list);
 
   bool CreateImplementation();
   void Destroy();
   void OnContextLost();
 
-  // Plugin instance this context is associated with.
-  PluginInstance* instance_;
-
   // PluginDelegate's 3D Context. Responsible for providing the command buffer.
   // Possibly NULL.
   scoped_ptr<PluginDelegate::PlatformContext3D> platform_context_;
 
   scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_;
   int32 transfer_buffer_id_;
   scoped_ptr<gpu::gles2::GLES2Implementation> gles2_impl_;
 
   PPB_Surface3D_Impl* draw_surface_;
   PPB_Surface3D_Impl* read_surface_;
 
   base::ScopedCallbackFactory<PPB_Context3D_Impl> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Context3D_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_CONTEXT_3D_IMPL_H_