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

This adds a specialization on the host and plugin side of the proxy. This
replaces the ad-hoc singleton tracking done by the resource and var trackers
with just being getters on this global object.

Most code can use the single PpapiGlobals class. I also allow code to get the
host and plugin specializations since some code needs access to some specific
features of each side.

In a later pass I'll move the other stuff out of TrackerBase and delete it.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/8316008

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8342016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106148 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 9 deletions

diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h
index cf71a5e..03ec57d 100644
--- a/ppapi/proxy/ppapi_proxy_test.h
+++ b/ppapi/proxy/ppapi_proxy_test.h
@@ -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 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase {
   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 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase {
   };
 
  private:
-  PluginGlobals plugin_globals_;
-
+  PluginResourceTracker resource_tracker_;
+  PluginVarTracker var_tracker_;
   scoped_ptr<PluginDispatcher> plugin_dispatcher_;
   PluginDelegateMock plugin_delegate_mock_;
 };