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

webkit/plugins/ppapi/ppb_flash_impl.cc

Index: webkit/plugins/ppapi/ppb_flash_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_flash_impl.cc	(revision 0)
+++ webkit/plugins/ppapi/ppb_flash_impl.cc	(working copy)
@@ -2,7 +2,7 @@
 // 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_private2.h"
+#include "webkit/plugins/ppapi/ppb_flash_impl.h"
 
 #include <string.h>
 
@@ -12,14 +12,15 @@
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_file_info_dev.h"
 #include "ppapi/c/dev/ppb_file_io_dev.h"
-#include "webkit/glue/plugins/pepper_error_util.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_private2.h"
+#include "webkit/plugins/ppapi/error_util.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_flash.h"
+#include "webkit/plugins/ppapi/var.h"
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 namespace {
 
@@ -170,7 +171,7 @@
     return PP_ERROR_FAILED;
 
   *contents = NULL;
-  PepperDirContents pepper_contents;
+  DirContents pepper_contents;
   base::PlatformFileError result =
       instance->delegate()->GetModuleLocalDirContents(
           instance->module()->name(),
@@ -219,9 +220,9 @@
   return instance->NavigateToURL(url, target);
 }
 
-const PPB_Private2 ppb_private2 = {
+const PPB_Flash ppb_flash = {
   &SetInstanceAlwaysOnTop,
-  &Private2::DrawGlyphs,
+  &PPB_Flash_Impl::DrawGlyphs,
   &GetProxyForURL,
   &OpenModuleLocalFile,
   &RenameModuleLocalFile,
@@ -236,8 +237,10 @@
 }  // namespace
 
 // static
-const PPB_Private2* Private2::GetInterface() {
-  return &ppb_private2;
+const PPB_Flash* PPB_Flash_Impl::GetInterface() {
+  return &ppb_flash;
 }
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
+