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

webkit/plugins/ppapi/ppb_flash_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/file_path.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #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 {
 
 PluginInstance* GetSomeInstance(PP_Module pp_module) {
   PluginModule* module = ResourceTracker::Get()->GetModule(pp_module);
   if (!module)
     return NULL;
 
   return module->GetSomeInstance();
 }
@@ skipping 130 matching lines @@
 }
 
 int32_t GetModuleLocalDirContents(PP_Module module,
                                   const char* path,
                                   PP_DirContents_Dev** contents) {
   PluginInstance* instance = GetSomeInstance(module);
   if (!instance)
     return PP_ERROR_FAILED;
 
   *contents = NULL;
-  PepperDirContents pepper_contents;
+  DirContents pepper_contents;
   base::PlatformFileError result =
       instance->delegate()->GetModuleLocalDirContents(
           instance->module()->name(),
           GetFilePathFromUTF8(path),
           &pepper_contents);
 
   if (result != base::PLATFORM_FILE_OK)
     return PlatformFileErrorToPepperError(result);
 
   *contents = new PP_DirContents_Dev;
@@ skipping 28 matching lines @@
 
 bool NavigateToURL(PP_Instance pp_instance,
                    const char* url,
                    const char* target) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
   if (!instance)
     return false;
   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,
   &DeleteModuleLocalFileOrDir,
   &CreateModuleLocalDir,
   &QueryModuleLocalFile,
   &GetModuleLocalDirContents,
   &FreeModuleLocalDirContents,
   &NavigateToURL,
 };
 
 }  // 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
+