4 files changed, 4 insertions, 20 deletions
diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
index 87b25a1..fbe89cf 100644
--- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
+++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
@@ -53,7 +53,7 @@ PP_Graphics3DTrustedState PPStateFromGPUState(
 }  // namespace.
 
 PPB_Graphics3D_Impl::PPB_Graphics3D_Impl(PP_Instance instance)
-    : Resource(instance),
+    : PPB_Graphics3D_Shared(instance),
       bound_to_instance_(false),
       commit_pending_(false),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
@@ -84,10 +84,6 @@ PP_Resource PPB_Graphics3D_Impl::CreateRaw(PP_Instance instance,
   return graphics_3d->GetReference();
 }
 
-PPB_Graphics3D_API* PPB_Graphics3D_Impl::AsPPB_Graphics3D_API() {
-  return this;
-}
-
 PP_Bool PPB_Graphics3D_Impl::InitCommandBuffer() {
   return PP_FromBool(GetCommandBuffer()->Initialize());
 }
diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.h b/webkit/plugins/ppapi/ppb_graphics_3d_impl.h
index 088b2f9..09ae41a 100644
--- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.h
+++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.h
@@ -13,8 +13,7 @@
 namespace webkit {
 namespace ppapi {
 
-class PPB_Graphics3D_Impl : public ::ppapi::Resource,
-                            public ::ppapi::PPB_Graphics3D_Shared {
+class PPB_Graphics3D_Impl : public ::ppapi::PPB_Graphics3D_Shared {
  public:
   virtual ~PPB_Graphics3D_Impl();
 
@@ -25,9 +24,6 @@ class PPB_Graphics3D_Impl : public ::ppapi::Resource,
                                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() OVERRIDE;
   virtual PP_Bool SetGetBuffer(int32_t transfer_buffer_id) OVERRIDE;
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
index a226a77..c83152c 100644
--- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
+++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
@@ -33,7 +33,7 @@ namespace webkit {
 namespace ppapi {
 
 PPB_VideoDecoder_Impl::PPB_VideoDecoder_Impl(PP_Instance instance)
-    : Resource(instance),
+    : PPB_VideoDecoder_Shared(instance),
       ppp_videodecoder_(NULL) {
   PluginModule* plugin_module = ResourceHelper::GetPluginModule(this);
   if (plugin_module) {
@@ -45,10 +45,6 @@ PPB_VideoDecoder_Impl::PPB_VideoDecoder_Impl(PP_Instance instance)
 PPB_VideoDecoder_Impl::~PPB_VideoDecoder_Impl() {
 }
 
-PPB_VideoDecoder_API* PPB_VideoDecoder_Impl::AsPPB_VideoDecoder_API() {
-  return this;
-}
-
 // Convert PP_VideoDecoder_Profile to media::VideoDecodeAccelerator::Profile.
 static media::VideoDecodeAccelerator::Profile PPToMediaProfile(
     const PP_VideoDecoder_Profile pp_profile) {
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h
index 2da3fe6..ac17497 100644
--- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h
+++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.h
@@ -31,8 +31,7 @@ class GLES2Implementation;
 namespace webkit {
 namespace ppapi {
 
-class PPB_VideoDecoder_Impl : public ::ppapi::Resource,
-                              public ::ppapi::PPB_VideoDecoder_Shared,
+class PPB_VideoDecoder_Impl : public ::ppapi::PPB_VideoDecoder_Shared,
                               public media::VideoDecodeAccelerator::Client {
  public:
   virtual ~PPB_VideoDecoder_Impl();
@@ -42,9 +41,6 @@ class PPB_VideoDecoder_Impl : public ::ppapi::Resource,
                             PP_Resource graphics_context,
                             PP_VideoDecoder_Profile profile);
 
-  // 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;