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

ppapi/shared_impl/ppapi_globals.cc

Index: ppapi/shared_impl/ppapi_globals.cc
===================================================================
--- ppapi/shared_impl/ppapi_globals.cc	(revision 117413)
+++ ppapi/shared_impl/ppapi_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.
 
@@ -8,12 +8,6 @@
 
 namespace ppapi {
 
-namespace {
-
-base::ThreadLocalPointer<PpapiGlobals> tls_ppapi_globals_for_test;
-
-}  // namespace
-
 PpapiGlobals* PpapiGlobals::ppapi_globals_ = NULL;
 
 PpapiGlobals::PpapiGlobals() {
@@ -21,34 +15,9 @@
   ppapi_globals_ = this;
 }
 
-PpapiGlobals::PpapiGlobals(ForTest) {
-  DCHECK(!ppapi_globals_);
-}
-
 PpapiGlobals::~PpapiGlobals() {
-  DCHECK(ppapi_globals_ == this || !ppapi_globals_);
+  DCHECK(ppapi_globals_ == this);
   ppapi_globals_ = NULL;
 }
 
-// static
-void PpapiGlobals::SetPpapiGlobalsOnThreadForTest(PpapiGlobals* ptr) {
-  // If we're using a per-thread PpapiGlobals, we should not have a global one.
-  // If we allowed it, it would always over-ride the "test" versions.
-  DCHECK(!ppapi_globals_);
-  tls_ppapi_globals_for_test.Set(ptr);
-}
-
-bool PpapiGlobals::IsHostGlobals() const {
-  return false;
-}
-
-bool PpapiGlobals::IsPluginGlobals() const {
-  return false;
-}
-
-// static
-PpapiGlobals* PpapiGlobals::GetThreadLocalPointer() {
-  return tls_ppapi_globals_for_test.Get();
-}
-
 }  // namespace ppapi