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

webkit/plugins/ppapi/ppb_pdf_impl.cc

Index: webkit/plugins/ppapi/ppb_pdf_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_pdf_impl.cc	(revision 0)
+++ webkit/plugins/ppapi/ppb_pdf_impl.cc	(working copy)
@@ -2,30 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "build/build_config.h"
+#include "webkit/plugins/ppapi/ppb_pdf_impl.h"
 
-#include "webkit/glue/plugins/pepper_private.h"
-
-#include "unicode/usearch.h"
-
 #include "app/resource_bundle.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "skia/ext/platform_canvas.h"
 #include "ppapi/c/pp_resource.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/icu/public/i18n/unicode/usearch.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/plugins/pepper_image_data.h"
-#include "webkit/glue/plugins/pepper_plugin_delegate.h"
-#include "webkit/glue/plugins/pepper_plugin_instance.h"
-#include "webkit/glue/plugins/pepper_plugin_module.h"
-#include "webkit/glue/plugins/pepper_var.h"
-#include "webkit/glue/plugins/ppb_private.h"
-#include "webkit/glue/plugins/pepper_var.h"
+#include "webkit/plugins/ppapi/plugin_delegate.h"
+#include "webkit/plugins/ppapi/plugin_instance.h"
+#include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
+#include "webkit/plugins/ppapi/ppb_pdf.h"
+#include "webkit/plugins/ppapi/var.h"
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 #if defined(OS_LINUX)
 class PrivateFontFile : public Resource {
@@ -120,8 +118,8 @@
   PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
   if (!module)
     return 0;
-  scoped_refptr<pepper::ImageData> image_data(new pepper::ImageData(module));
-  if (!image_data->Init(ImageData::GetNativeImageDataFormat(),
+  scoped_refptr<PPB_ImageData_Impl> image_data(new PPB_ImageData_Impl(module));
+  if (!image_data->Init(PPB_ImageData_Impl::GetNativeImageDataFormat(),
                         res_bitmap->width(), res_bitmap->height(), false)) {
     return 0;
   }
@@ -165,7 +163,7 @@
 
   return font->GetReference();
 #else
-  // For trusted pepper plugins, this is only needed in Linux since font loading
+  // For trusted PPAPI plugins, this is only needed in Linux since font loading
   // on Windows and Mac works through the renderer sandbox.
   return 0;
 #endif
@@ -267,7 +265,7 @@
     webkit_glue::UserMetricsRecordAction(action_str->value());
 }
 
-const PPB_Private ppb_private = {
+const PPB_PDF ppb_pdf = {
   &GetLocalizedString,
   &GetResourceImage,
   &GetFontFileWithFallback,
@@ -283,8 +281,8 @@
 }  // namespace
 
 // static
-const PPB_Private* Private::GetInterface() {
-  return &ppb_private;
+const PPB_PDF* PPB_PDF_Impl::GetInterface() {
+  return &ppb_pdf;
 }
 
 #if defined(OS_LINUX)
@@ -299,4 +297,6 @@
 }
 #endif
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
+