Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/callbacks_unittest.cc

Index: webkit/plugins/ppapi/callbacks_unittest.cc
===================================================================
--- webkit/plugins/ppapi/callbacks_unittest.cc	(revision 106515)
+++ webkit/plugins/ppapi/callbacks_unittest.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "webkit/plugins/ppapi/callbacks.h"
+#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/mock_resource.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
@@ -184,7 +185,8 @@
 
 // Test that callbacks get aborted on the last resource unref.
 TEST_F(CallbackResourceTest, AbortOnNoRef) {
-  ResourceTracker* resource_tracker = ResourceTracker::Get();
+  ResourceTracker* resource_tracker =
+      HostGlobals::Get()->host_resource_tracker();
 
   // Test several things: Unref-ing a resource (to zero refs) with callbacks
   // which (1) have been run, (2) have been aborted, (3) haven't been completed.
@@ -223,7 +225,8 @@
 // Test that "resurrecting" a resource (getting a new ID for a |Resource|)
 // doesn't resurrect callbacks.
 TEST_F(CallbackResourceTest, Resurrection) {
-  ResourceTracker* resource_tracker = ResourceTracker::Get();
+  ResourceTracker* resource_tracker =
+      HostGlobals::Get()->host_resource_tracker();
 
   scoped_refptr<CallbackMockResource> resource(
       new CallbackMockResource(instance()->pp_instance()));
Property changes on: webkit/plugins/ppapi/callbacks_unittest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/callbacks_unittest.cc:r3734-4217,4606-5108,5177-5263