Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/ppb_video_decoder_impl.cc

Index: webkit/plugins/ppapi/ppb_video_decoder_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_video_decoder_impl.cc	(revision 0)
+++ webkit/plugins/ppapi/ppb_video_decoder_impl.cc	(working copy)
@@ -2,27 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/plugins/pepper_video_decoder.h"
+#include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
-#include "webkit/glue/plugins/pepper_common.h"
-#include "webkit/glue/plugins/pepper_file_ref.h"
-#include "webkit/glue/plugins/pepper_plugin_instance.h"
-#include "webkit/glue/plugins/pepper_resource_tracker.h"
+#include "webkit/plugins/ppapi/common.h"
+#include "webkit/plugins/ppapi/plugin_instance.h"
+#include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
+#include "webkit/plugins/ppapi/resource_tracker.h"
 
-namespace pepper {
+namespace webkit {
+namespace plugins {
+namespace ppapi {
 
 namespace {
 
 PP_Bool GetConfig(PP_Instance instance_id,
-               PP_VideoCodecId_Dev codec,
-               PP_VideoConfig_Dev* configs,
-               int32_t config_size,
-               int32_t *num_config) {
+                  PP_VideoCodecId_Dev codec,
+                  PP_VideoConfig_Dev* configs,
+                  int32_t config_size,
+                  int32_t *num_config) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   *num_config = 0;
   if (!instance)
@@ -45,7 +47,8 @@
   if (!instance)
     return 0;
 
-  scoped_refptr<VideoDecoder> decoder(new VideoDecoder(instance));
+  scoped_refptr<PPB_VideoDecoder_Impl> decoder(
+      new PPB_VideoDecoder_Impl(instance));
 
   if (!decoder->Init(*decoder_config))
     return 0;
@@ -55,8 +58,8 @@
 
 PP_Bool Decode(PP_Resource decoder_id,
             PP_VideoCompressedDataBuffer_Dev* input_buffer) {
-  scoped_refptr<VideoDecoder> decoder(
-      Resource::GetAs<VideoDecoder>(decoder_id));
+  scoped_refptr<PPB_VideoDecoder_Impl> decoder(
+      Resource::GetAs<PPB_VideoDecoder_Impl>(decoder_id));
   if (!decoder)
     return PP_FALSE;
 
@@ -65,18 +68,19 @@
 }
 
 int32_t Flush(PP_Resource decoder_id, PP_CompletionCallback callback) {
-  scoped_refptr<VideoDecoder> decoder(
-      Resource::GetAs<VideoDecoder>(decoder_id));
+  scoped_refptr<PPB_VideoDecoder_Impl> decoder(
+      Resource::GetAs<PPB_VideoDecoder_Impl>(decoder_id));
   if (!decoder)
     return PP_ERROR_BADRESOURCE;
 
   return decoder->Flush(callback);
 }
 
-PP_Bool ReturnUncompressedDataBuffer(PP_Resource decoder_id,
-                                  PP_VideoUncompressedDataBuffer_Dev* buffer) {
-  scoped_refptr<VideoDecoder> decoder(
-      Resource::GetAs<VideoDecoder>(decoder_id));
+PP_Bool ReturnUncompressedDataBuffer(
+    PP_Resource decoder_id,
+    PP_VideoUncompressedDataBuffer_Dev* buffer) {
+  scoped_refptr<PPB_VideoDecoder_Impl> decoder(
+      Resource::GetAs<PPB_VideoDecoder_Impl>(decoder_id));
   if (!decoder)
     return PP_FALSE;
 
@@ -93,24 +97,25 @@
 
 }  // namespace
 
-VideoDecoder::VideoDecoder(PluginInstance* instance)
+PPB_VideoDecoder_Impl::PPB_VideoDecoder_Impl(PluginInstance* instance)
     : Resource(instance->module()),
       instance_(instance) {
 }
 
-VideoDecoder::~VideoDecoder() {
+PPB_VideoDecoder_Impl::~PPB_VideoDecoder_Impl() {
 }
 
 // static
-const PPB_VideoDecoder_Dev* VideoDecoder::GetInterface() {
+const PPB_VideoDecoder_Dev* PPB_VideoDecoder_Impl::GetInterface() {
   return &ppb_videodecoder;
 }
 
-VideoDecoder* VideoDecoder::AsVideoDecoder() {
+PPB_VideoDecoder_Impl* PPB_VideoDecoder_Impl::AsVideoDecoder() {
   return this;
 }
 
-bool VideoDecoder::Init(const PP_VideoDecoderConfig_Dev& decoder_config) {
+bool PPB_VideoDecoder_Impl::Init(
+    const PP_VideoDecoderConfig_Dev& decoder_config) {
   if (!instance())
     return false;
 
@@ -120,21 +125,22 @@
   return platform_video_decoder_.get()? true : false;
 }
 
-bool VideoDecoder::Decode(PP_VideoCompressedDataBuffer_Dev& input_buffer) {
+bool PPB_VideoDecoder_Impl::Decode(
+    PP_VideoCompressedDataBuffer_Dev& input_buffer) {
   if (!platform_video_decoder_.get())
     return false;
 
   return platform_video_decoder_->Decode(input_buffer);
 }
 
-int32_t VideoDecoder::Flush(PP_CompletionCallback& callback) {
+int32_t PPB_VideoDecoder_Impl::Flush(PP_CompletionCallback& callback) {
   if (!platform_video_decoder_.get())
     return PP_ERROR_FAILED;
 
   return platform_video_decoder_->Flush(callback);
 }
 
-bool VideoDecoder::ReturnUncompressedDataBuffer(
+bool PPB_VideoDecoder_Impl::ReturnUncompressedDataBuffer(
     PP_VideoUncompressedDataBuffer_Dev& buffer) {
   if (!platform_video_decoder_.get())
     return false;
@@ -142,4 +148,7 @@
   return platform_video_decoder_->ReturnUncompressedDataBuffer(buffer);
 }
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace plugins
+}  // namespace webkit
+