Add a new globals object for PPAPI tracking information.

ppapi/proxy/ppapi_proxy_test.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_test_sink.h"
 #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"
 
 namespace ppapi {
 namespace proxy {
 
 // Base class for plugin and host test harnesses. Tests will not use this
 // directly. Instead, use the PluginProxyTest, HostProxyTest, or TwoWayTest.
 class ProxyTestHarnessBase {
@@ skipping 45 matching lines @@
   std::map<std::string, const void*> registered_interfaces_;
 };
 
 // Test harness for the plugin side of the proxy.
 class PluginProxyTestHarness : public ProxyTestHarnessBase {
  public:
   PluginProxyTestHarness();
   virtual ~PluginProxyTestHarness();
 
   PluginDispatcher* plugin_dispatcher() { return plugin_dispatcher_.get(); }
-  PluginResourceTracker& resource_tracker() { return resource_tracker_; }
-  PluginVarTracker& var_tracker() { return var_tracker_; }
+  PluginResourceTracker& resource_tracker() {
+    return *plugin_globals_.plugin_resource_tracker();
+  }
+  PluginVarTracker& var_tracker() {
+    return *plugin_globals_.plugin_var_tracker();
+  }
 
   // ProxyTestHarnessBase implementation.
   virtual Dispatcher* GetDispatcher();
   virtual void SetUpHarness();
   virtual void SetUpHarnessWithChannel(const IPC::ChannelHandle& channel_handle,
                                        base::MessageLoopProxy* ipc_message_loop,
                                        base::WaitableEvent* shutdown_event,
                                        bool is_client);
   virtual void TearDownHarness();
 
@@ skipping 23 matching lines @@
 
    private:
     base::MessageLoopProxy* ipc_message_loop_;  // Weak
     base::WaitableEvent* shutdown_event_;  // Weak
     std::set<PP_Instance> instance_id_set_;
 
     DISALLOW_COPY_AND_ASSIGN(PluginDelegateMock);
   };
 
  private:
-  PluginResourceTracker resource_tracker_;
-  PluginVarTracker var_tracker_;
+  PluginGlobals plugin_globals_;
+
   scoped_ptr<PluginDispatcher> plugin_dispatcher_;
   PluginDelegateMock plugin_delegate_mock_;
 };
 
 class PluginProxyTest : public PluginProxyTestHarness, public testing::Test {
  public:
   PluginProxyTest();
   virtual ~PluginProxyTest();
 
   // testing::Test implementation.
@@ skipping 96 matching lines @@
   // stopping the harnesses.
   ProxyTestHarnessBase* remote_harness_;
   ProxyTestHarnessBase* local_harness_;
 
   base::WaitableEvent channel_created_;
   base::WaitableEvent shutdown_event_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi