Revert 117399 - Make it possible to have 1 PpapiGlobals per thread. Update unit tests.

ppapi/proxy/ppapi_proxy_test.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_proxy_delegate.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
-#include "ppapi/shared_impl/test_globals.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 {
  public:
   ProxyTestHarnessBase();
   virtual ~ProxyTestHarnessBase();
 
   PP_Module pp_module() const { return pp_module_; }
   PP_Instance pp_instance() const { return pp_instance_; }
   IPC::TestSink& sink() { return sink_; }
 
-  virtual PpapiGlobals* GetGlobals() = 0;
   // Returns either the plugin or host dispatcher, depending on the test.
   virtual Dispatcher* GetDispatcher() = 0;
 
   // Set up the harness using an IPC::TestSink to capture messages.
   virtual void SetUpHarness() = 0;
 
   // Set up the harness using a real IPC channel.
   virtual void SetUpHarnessWithChannel(const IPC::ChannelHandle& channel_handle,
                                        base::MessageLoopProxy* ipc_message_loop,
                                        base::WaitableEvent* shutdown_event,
@@ skipping 35 matching lines @@
 
   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();
   }
 
   // ProxyTestHarnessBase implementation.
-  virtual PpapiGlobals* GetGlobals() { return &plugin_globals_; }
   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();
 
   class PluginDelegateMock : public PluginDispatcher::PluginDelegate,
                              public PluginProxyDelegate {
@@ skipping 49 matching lines @@
  private:
   MessageLoop message_loop_;
 };
 
 class HostProxyTestHarness : public ProxyTestHarnessBase {
  public:
   HostProxyTestHarness();
   virtual ~HostProxyTestHarness();
 
   HostDispatcher* host_dispatcher() { return host_dispatcher_.get(); }
-  ResourceTracker& resource_tracker() {
-    return *host_globals_.GetResourceTracker();
-  }
-  VarTracker& var_tracker() {
-    return *host_globals_.GetVarTracker();
-  }
 
   // ProxyTestBase implementation.
-  virtual PpapiGlobals* GetGlobals() { return &host_globals_; }
   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();
 
   class DelegateMock : public ProxyChannel::Delegate {
    public:
@@ skipping 12 matching lines @@
     virtual base::WaitableEvent* GetShutdownEvent();
 
    private:
     base::MessageLoopProxy* ipc_message_loop_;  // Weak
     base::WaitableEvent* shutdown_event_;  // Weak
 
     DISALLOW_COPY_AND_ASSIGN(DelegateMock);
   };
 
  private:
-  ppapi::TestGlobals host_globals_;
   scoped_ptr<HostDispatcher> host_dispatcher_;
   DelegateMock delegate_mock_;
 };
 
 class HostProxyTest : public HostProxyTestHarness, public testing::Test {
  public:
   HostProxyTest();
   virtual ~HostProxyTest();
 
   // testing::Test implementation.
@@ skipping 40 matching lines @@
   // stopping the harnesses.
   ProxyTestHarnessBase* remote_harness_;
   ProxyTestHarnessBase* local_harness_;
 
   base::WaitableEvent channel_created_;
   base::WaitableEvent shutdown_event_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi