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

webkit/plugins/ppapi/host_globals.cc

Index: webkit/plugins/ppapi/host_globals.cc
===================================================================
--- webkit/plugins/ppapi/host_globals.cc	(revision 117413)
+++ webkit/plugins/ppapi/host_globals.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -45,13 +45,8 @@
   host_globals_ = this;
 }
 
-HostGlobals::HostGlobals(::ppapi::PpapiGlobals::ForTest for_test)
-    : ::ppapi::PpapiGlobals(for_test) {
-  DCHECK(!host_globals_);
-}
-
 HostGlobals::~HostGlobals() {
-  DCHECK(host_globals_ == this || !host_globals_);
+  DCHECK(host_globals_ == this);
   host_globals_ = NULL;
 }
 
@@ -121,11 +116,6 @@
   return inst->module()->pp_module();
 }
 
-base::Lock* HostGlobals::GetProxyLock() {
-  // We do not lock on the host side.
-  return NULL;
-}
-
 PP_Module HostGlobals::AddModule(PluginModule* module) {
 #ifndef NDEBUG
   // Make sure we're not adding one more than once.
@@ -207,9 +197,5 @@
   return found->second->instance;
 }
 
-bool HostGlobals::IsHostGlobals() const {
-  return true;
-}
-
 }  // namespace ppapi
 }  // namespace webkit