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

webkit/plugins/ppapi/resource_tracker.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_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>
 
 #include "base/basictypes.h"
 #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 ppapi {
 
 class PluginInstance;
 class PluginModule;
 class Resource;
 class ResourceTrackerTest;
 
 // This class maintains a global list of all live pepper resources. It allows
 // us to check resource ID validity and to map them to a specific module.
 //
 // This object is threadsafe.
@@ skipping 53 matching lines @@
 
   // Called when a plugin instance was deleted and should no longer be tracked.
   // The given handle should be one generated by AddInstance.
   void InstanceDeleted(PP_Instance instance);
 
   // Returns a pointer to the plugin instance object associated with the given
   // instance handle. The return value will be NULL if the handle is invalid.
   PluginInstance* GetInstance(PP_Instance instance);
 
  private:
-  friend struct DefaultSingletonTraits<ResourceTracker>;
+  friend struct base::DefaultLazyInstanceTraits<ResourceTracker>;
   friend class Resource;
   friend class ResourceTrackerTest;
 
   // Prohibit creation other then by the Singleton class.
   ResourceTracker();
   ~ResourceTracker();
 
   // Adds the given resource to the tracker and assigns it a resource ID and
   // refcount of 1. The assigned resource ID will be returned. Used only by the
   // Resource class.
@@ skipping 27 matching lines @@
   InstanceMap instance_map_;
 
   // Tracks all live modules. The pointers are non-owning, the PluginModule
   // destructor will notify us when the module is deleted.
   typedef std::map<PP_Module, PluginModule*> ModuleMap;
   ModuleMap module_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceTracker);
 };
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_TRACKER_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_