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

ppapi/proxy/plugin_globals.cc

Index: ppapi/proxy/plugin_globals.cc
===================================================================
--- ppapi/proxy/plugin_globals.cc	(revision 117413)
+++ ppapi/proxy/plugin_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.
 
@@ -19,15 +19,8 @@
   plugin_globals_ = this;
 }
 
-PluginGlobals::PluginGlobals(ForTest for_test)
-    : ppapi::PpapiGlobals(for_test),
-      plugin_proxy_delegate_(NULL),
-      callback_tracker_(new CallbackTracker) {
-  DCHECK(!plugin_globals_);
-}
-
 PluginGlobals::~PluginGlobals() {
-  DCHECK(plugin_globals_ == this || !plugin_globals_);
+  DCHECK(plugin_globals_ == this);
   plugin_globals_ = NULL;
 }
 
@@ -58,17 +51,5 @@
   return 0;
 }
 
-base::Lock* PluginGlobals::GetProxyLock() {
-#ifdef ENABLE_PEPPER_THREADING
-  return &proxy_lock_;
-#else
-  return NULL;
-#endif
-}
-
-bool PluginGlobals::IsPluginGlobals() const {
-  return true;
-}
-
 }  // namespace proxy
 }  // namespace ppapi