Revert 106142 - Add a new globals object for PPAPI tracking information.

ppapi/proxy/ppapi_proxy_test.cc

Index: ppapi/proxy/ppapi_proxy_test.cc
===================================================================
--- ppapi/proxy/ppapi_proxy_test.cc	(revision 106146)
+++ ppapi/proxy/ppapi_proxy_test.cc	(working copy)
@@ -151,7 +151,9 @@
 
 void PluginProxyTestHarness::SetUpHarness() {
   // These must be first since the dispatcher set-up uses them.
-  resource_tracker().DidCreateInstance(pp_instance());
+  resource_tracker_.DidCreateInstance(pp_instance());
+  PluginResourceTracker::SetInstanceForTest(&resource_tracker_);
+  resource_tracker_.set_var_tracker_test_override(&var_tracker_);
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       base::Process::Current().handle(),
@@ -166,7 +168,9 @@
     base::WaitableEvent* shutdown_event,
     bool is_client) {
   // These must be first since the dispatcher set-up uses them.
-  resource_tracker().DidCreateInstance(pp_instance());
+  resource_tracker_.DidCreateInstance(pp_instance());
+  PluginResourceTracker::SetInstanceForTest(&resource_tracker_);
+  resource_tracker_.set_var_tracker_test_override(&var_tracker_);
   plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
 
   plugin_dispatcher_.reset(new PluginDispatcher(
@@ -182,7 +186,8 @@
   plugin_dispatcher_->DidDestroyInstance(pp_instance());
   plugin_dispatcher_.reset();
 
-  resource_tracker().DidDeleteInstance(pp_instance());
+  resource_tracker_.DidDeleteInstance(pp_instance());
+  PluginResourceTracker::SetInstanceForTest(NULL);
 }
 
 base::MessageLoopProxy*