Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/resource_helper.cc

Index: webkit/plugins/ppapi/resource_helper.cc
===================================================================
--- webkit/plugins/ppapi/resource_helper.cc	(revision 106515)
+++ webkit/plugins/ppapi/resource_helper.cc	(working copy)
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "ppapi/shared_impl/resource.h"
+#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
@@ -17,7 +18,7 @@
 // static
 PluginInstance* ResourceHelper::GetPluginInstance(
     const ::ppapi::Resource* resource) {
-  ResourceTracker* tracker = ResourceTracker::Get();
+  ResourceTracker* tracker = HostGlobals::Get()->host_resource_tracker();
   return tracker->GetInstance(resource->pp_instance());
 }
 
Property changes on: webkit/plugins/ppapi/resource_helper.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/resource_helper.cc:r3734-4217,4606-5108,5177-5263