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

ppapi/proxy/ppapi_proxy_test.cc

-// 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 "ppapi/proxy/ppapi_proxy_test.h"
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "base/observer_list.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 120 matching lines @@
   TupleTypes<PpapiMsg_SupportsInterface::ReplyParam>::ValueTuple reply_data;
   EXPECT_TRUE(PpapiMsg_SupportsInterface::ReadReplyParam(
       reply_msg, &reply_data));
 
   sink().ClearMessages();
   return reply_data.a;
 }
 
 // PluginProxyTestHarness ------------------------------------------------------
 
-PluginProxyTestHarness::PluginProxyTestHarness()
-    : plugin_globals_(PpapiGlobals::ForTest()) {
+PluginProxyTestHarness::PluginProxyTestHarness() {
 }
 
 PluginProxyTestHarness::~PluginProxyTestHarness() {
 }
 
 Dispatcher* PluginProxyTestHarness::GetDispatcher() {
   return plugin_dispatcher_.get();
 }
 
 void PluginProxyTestHarness::SetUpHarness() {
   // These must be first since the dispatcher set-up uses them.
-  PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   resource_tracker().DidCreateInstance(pp_instance());
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       base::Process::Current().handle(),
       &MockGetInterface));
   plugin_dispatcher_->InitWithTestSink(&sink());
   plugin_dispatcher_->DidCreateInstance(pp_instance());
 }
 
 void PluginProxyTestHarness::SetUpHarnessWithChannel(
     const IPC::ChannelHandle& channel_handle,
     base::MessageLoopProxy* ipc_message_loop,
     base::WaitableEvent* shutdown_event,
     bool is_client) {
   // These must be first since the dispatcher set-up uses them.
-  PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   resource_tracker().DidCreateInstance(pp_instance());
   plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       base::Process::Current().handle(),
       &MockGetInterface));
   plugin_dispatcher_->InitPluginWithChannel(&plugin_delegate_mock_,
                                             channel_handle,
                                             is_client);
   plugin_dispatcher_->DidCreateInstance(pp_instance());
@@ skipping 62 matching lines @@
 void PluginProxyTest::SetUp() {
   SetUpHarness();
 }
 
 void PluginProxyTest::TearDown() {
   TearDownHarness();
 }
 
 // HostProxyTestHarness --------------------------------------------------------
 
-HostProxyTestHarness::HostProxyTestHarness()
-    : host_globals_(PpapiGlobals::ForTest()) {
+HostProxyTestHarness::HostProxyTestHarness() {
 }
 
 HostProxyTestHarness::~HostProxyTestHarness() {
 }
 
 Dispatcher* HostProxyTestHarness::GetDispatcher() {
   return host_dispatcher_.get();
 }
 
 void HostProxyTestHarness::SetUpHarness() {
-  // These must be first since the dispatcher set-up uses them.
-  PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   host_dispatcher_.reset(new HostDispatcher(
       base::Process::Current().handle(),
       pp_module(),
       &MockGetInterface));
   host_dispatcher_->InitWithTestSink(&sink());
   HostDispatcher::SetForInstance(pp_instance(), host_dispatcher_.get());
 }
 
 void HostProxyTestHarness::SetUpHarnessWithChannel(
     const IPC::ChannelHandle& channel_handle,
     base::MessageLoopProxy* ipc_message_loop,
     base::WaitableEvent* shutdown_event,
     bool is_client) {
-  // These must be first since the dispatcher set-up uses them.
-  PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   delegate_mock_.Init(ipc_message_loop, shutdown_event);
-
   host_dispatcher_.reset(new HostDispatcher(
       base::Process::Current().handle(),
       pp_module(),
       &MockGetInterface));
   ppapi::Preferences preferences;
   host_dispatcher_->InitHostWithChannel(&delegate_mock_, channel_handle,
                                         is_client, preferences);
   HostDispatcher::SetForInstance(pp_instance(), host_dispatcher_.get());
 }
 
@@ skipping 52 matching lines @@
 }
 
 void TwoWayTest::SetUp() {
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   io_thread_.StartWithOptions(options);
   plugin_thread_.Start();
 
   IPC::ChannelHandle handle;
   handle.name = "TwoWayTestChannel";
+
   base::WaitableEvent remote_harness_set_up(true, false);
   plugin_thread_.message_loop_proxy()->PostTask(
       FROM_HERE,
       base::Bind(&SetUpRemoteHarness,
                  remote_harness_,
                  handle,
                  io_thread_.message_loop_proxy(),
                  &shutdown_event_,
                  &remote_harness_set_up));
   remote_harness_set_up.Wait();
@@ skipping 13 matching lines @@
   remote_harness_torn_down.Wait();
 
   local_harness_->TearDownHarness();
 
   io_thread_.Stop();
 }
 
 
 }  // namespace proxy
 }  // namespace ppapi