Make it possible to write simple unit tests for the pepper implementation. Th...

webkit/glue/plugins/pepper_resource_tracker.cc

Index: webkit/glue/plugins/pepper_resource_tracker.cc
===================================================================
--- webkit/glue/plugins/pepper_resource_tracker.cc	(revision 68719)
+++ webkit/glue/plugins/pepper_resource_tracker.cc	(working copy)
@@ -22,6 +22,9 @@
   return result->second.first;
 }
 
+// static
+ResourceTracker* ResourceTracker::singleton_override_ = NULL;
+
 ResourceTracker::ResourceTracker()
     : last_id_(0) {
 }
@@ -31,6 +34,8 @@
 
 // static
 ResourceTracker* ResourceTracker::Get() {
+  if (singleton_override_)
+    return singleton_override_;
   return Singleton<ResourceTracker>::get();
 }
 
@@ -73,7 +78,7 @@
 
 void ResourceTracker::ForceDeletePluginResourceRefs(PP_Resource res) {
   ResourceMap::iterator i = live_resources_.find(res);
-  if (i != live_resources_.end())
+  if (i == live_resources_.end())
     return;  // Nothing to do.
 
   i->second.second = 0;
@@ -169,4 +174,16 @@
   return found->second;
 }
 
+// static
+void ResourceTracker::SetSingletonOverride(ResourceTracker* tracker) {
+  DCHECK(!singleton_override_);
+  singleton_override_ = tracker;
+}
+
+// static
+void ResourceTracker::ClearSingletonOverride() {
+  DCHECK(singleton_override_);
+  singleton_override_ = NULL;
+}
+
 }  // namespace pepper