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

webkit/plugins/ppapi/resource_tracker.h

Index: webkit/plugins/ppapi/resource_tracker.h
===================================================================
--- webkit/plugins/ppapi/resource_tracker.h	(revision 0)
+++ webkit/plugins/ppapi/resource_tracker.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_RESOURCE_TRACKER_H_
-#define WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_TRACKER_H_
+#ifndef WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_
+#define WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_
 
 #include <map>
 #include <utility>
@@ -12,13 +12,18 @@
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
-#include "base/singleton.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 
-namespace pepper {
+namespace base {
+template <typename T> struct DefaultLazyInstanceTraits;
+}
 
+namespace webkit {
+namespace plugins {
+namespace ppapi {
+
 class PluginInstance;
 class PluginModule;
 class Resource;
@@ -91,7 +96,7 @@
   PluginInstance* GetInstance(PP_Instance instance);
 
  private:
-  friend struct DefaultSingletonTraits<ResourceTracker>;
+  friend struct base::DefaultLazyInstanceTraits<ResourceTracker>;
   friend class Resource;
   friend class ResourceTrackerTest;
 
@@ -139,6 +144,8 @@
   DISALLOW_COPY_AND_ASSIGN(ResourceTracker);
 };
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace plugins
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_TRACKER_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_