Merge PlatformVideoDecoder into PPB_VideoDecoder_Impl

content/renderer/pepper/ppb_video_decoder_impl.h

Index: content/renderer/pepper/ppb_video_decoder_impl.h
diff --git a/content/renderer/pepper/ppb_video_decoder_impl.h b/content/renderer/pepper/ppb_video_decoder_impl.h
index ad782f1ea275fe286735e3a274603d863e276bbb..8cbaedbc1c9fe82a00fa882ce97183051da77588 100644
--- a/content/renderer/pepper/ppb_video_decoder_impl.h
+++ b/content/renderer/pepper/ppb_video_decoder_impl.h
@@ -72,9 +72,9 @@ class PPB_VideoDecoder_Impl : public ppapi::PPB_VideoDecoder_Shared,
             gpu::gles2::GLES2Implementation* gles2_impl,
             PP_VideoDecoder_Profile profile);
 
-  // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is
-  // swapped with another.
-  scoped_ptr<PlatformVideoDecoder> platform_video_decoder_;
+  // This is NULL before initialization, and after destruction.
+  // Holds a GpuVideoDecodeAcceleratorHost.
+  scoped_ptr<media::VideoDecodeAccelerator> decoder_;
 
   // Reference to the plugin requesting this interface.
   const PPP_VideoDecoder_Dev* ppp_videodecoder_;