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

webkit/plugins/ppapi/plugin_module.h

 // 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.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_MODULE_H_
-#define WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_MODULE_H_
+#ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
+#define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/native_library.h"
 #include "base/process.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/weak_ptr.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/ppb.h"
-#include "webkit/glue/plugins/pepper_plugin_delegate.h"
+#include "webkit/plugins/ppapi/plugin_delegate.h"
 
 class FilePath;
 class MessageLoop;
 typedef struct NPObject NPObject;
 struct PPB_Core;
 typedef void* NPIdentifier;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace pp {
 namespace proxy {
 class HostDispatcher;
 }  // proxy
 }  // pp
 
 namespace IPC {
 struct ChannelHandle;
 }
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 class ObjectVar;
 class PluginDelegate;
 class PluginInstance;
 class PluginObject;
 
 // Represents one plugin library loaded into one renderer. This library may
 // have multiple instances.
 //
 // Note: to get from a PP_Instance to a PluginInstance*, use the
@@ skipping 116 matching lines @@
   // the corresponding object. These are non-owning references.
   typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap;;
   NPObjectToObjectVarMap np_object_to_object_var_;
 
   typedef std::set<PluginObject*> PluginObjectSet;
   PluginObjectSet live_plugin_objects_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginModule);
 };
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_MODULE_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_