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

ppapi/proxy/ppapi_proxy_test.h

Index: ppapi/proxy/ppapi_proxy_test.h
===================================================================
--- ppapi/proxy/ppapi_proxy_test.h	(revision 106146)
+++ ppapi/proxy/ppapi_proxy_test.h	(working copy)
@@ -13,7 +13,6 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -79,12 +78,8 @@
   virtual ~PluginProxyTestHarness();
 
   PluginDispatcher* plugin_dispatcher() { return plugin_dispatcher_.get(); }
-  PluginResourceTracker& resource_tracker() {
-    return *plugin_globals_.plugin_resource_tracker();
-  }
-  PluginVarTracker& var_tracker() {
-    return *plugin_globals_.plugin_var_tracker();
-  }
+  PluginResourceTracker& resource_tracker() { return resource_tracker_; }
+  PluginVarTracker& var_tracker() { return var_tracker_; }
 
   // ProxyTestHarnessBase implementation.
   virtual Dispatcher* GetDispatcher();
@@ -128,8 +123,8 @@
   };
 
  private:
-  PluginGlobals plugin_globals_;
-
+  PluginResourceTracker resource_tracker_;
+  PluginVarTracker var_tracker_;
   scoped_ptr<PluginDispatcher> plugin_dispatcher_;
   PluginDelegateMock plugin_delegate_mock_;
 };