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

webkit/plugins/ppapi/plugin_delegate.h

Index: webkit/plugins/ppapi/plugin_delegate.h
===================================================================
--- webkit/plugins/ppapi/plugin_delegate.h	(revision 0)
+++ webkit/plugins/ppapi/plugin_delegate.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_DELEGATE_H_
-#define WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_DELEGATE_H_
+#ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
+#define WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
 
 #include <string>
 
@@ -19,7 +19,7 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_stdint.h"
 #include "webkit/fileapi/file_system_types.h"
-#include "webkit/glue/plugins/pepper_dir_contents.h"
+#include "webkit/plugins/ppapi/dir_contents.h"
 
 class AudioMessageFilter;
 class GURL;
@@ -58,21 +58,22 @@
 
 class TransportDIB;
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 class FileIO;
 class PluginInstance;
 class FullscreenContainer;
 
 // Virtual interface that the browser implements to implement features for
-// Pepper plugins.
+// PPAPI plugins.
 class PluginDelegate {
  public:
   // This class is implemented by the PluginDelegate implementation and is
   // designed to manage the lifetime and communicatin with the proxy's
-  // HostDispatcher for out-of-process pepper plugins.
+  // HostDispatcher for out-of-process PPAPI plugins.
   //
-  // The point of this is to avoid having a relationship from the pepper plugin
+  // The point of this is to avoid having a relationship from the PPAPI plugin
   // implementation to the ppapi proxy code. Otherwise, things like the IPC
   // system will be dependencies of the webkit directory, which we don't want.
   //
@@ -188,12 +189,12 @@
   };
 
   // Indicates that the given instance has been created.
-  virtual void InstanceCreated(pepper::PluginInstance* instance) = 0;
+  virtual void InstanceCreated(PluginInstance* instance) = 0;
 
   // Indicates that the given instance is being destroyed. This is called from
   // the destructor, so it's important that the instance is not dereferenced
   // from this call.
-  virtual void InstanceDeleted(pepper::PluginInstance* instance) = 0;
+  virtual void InstanceDeleted(PluginInstance* instance) = 0;
 
   // The caller will own the pointer returned from this.
   virtual PlatformImage2D* CreateImage2D(int width, int height) = 0;
@@ -276,7 +277,7 @@
   virtual base::PlatformFileError GetModuleLocalDirContents(
       const std::string& module_name,
       const FilePath& path,
-      PepperDirContents* contents) = 0;
+      DirContents* contents) = 0;
 
   // Returns a MessageLoopProxy instance associated with the message loop
   // of the file thread in this renderer.
@@ -307,6 +308,7 @@
   virtual void SetContentRestriction(int restrictions) = 0;
 };
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_DELEGATE_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_