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

webkit/plugins/ppapi/resource_tracker.cc

Index: webkit/plugins/ppapi/resource_tracker.cc
===================================================================
--- webkit/plugins/ppapi/resource_tracker.cc	(revision 0)
+++ webkit/plugins/ppapi/resource_tracker.cc	(working copy)
@@ -2,18 +2,23 @@
 // 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_resource_tracker.h"
+#include "webkit/plugins/ppapi/resource_tracker.h"
 
 #include <limits>
 #include <set>
 
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "ppapi/c/pp_resource.h"
-#include "webkit/glue/plugins/pepper_resource.h"
+#include "webkit/plugins/ppapi/resource.h"
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
+static base::LazyInstance<ResourceTracker> g_resource_tracker(
+    base::LINKER_INITIALIZED);
+
 scoped_refptr<Resource> ResourceTracker::GetResource(PP_Resource res) const {
   ResourceMap::const_iterator result = live_resources_.find(res);
   if (result == live_resources_.end()) {
@@ -36,7 +41,7 @@
 ResourceTracker* ResourceTracker::Get() {
   if (singleton_override_)
     return singleton_override_;
-  return Singleton<ResourceTracker>::get();
+  return g_resource_tracker.Pointer();
 }
 
 PP_Resource ResourceTracker::AddResource(Resource* resource) {
@@ -186,4 +191,6 @@
   singleton_override_ = NULL;
 }
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
+