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

ppapi/proxy/plugin_resource_tracker.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/plugin_resource_tracker.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/var.h"
 
 namespace ppapi {
 namespace proxy {
 
 PluginResourceTracker::PluginResourceTracker() {
+#ifdef ENABLE_PEPPER_THREADING
+  // Set the global proxy lock, since the plugin-side of the proxy needs to be
+  // synchronized.
+  ppapi::ProxyLock::Set(&proxy_lock_);
+#endif
 }
 
 PluginResourceTracker::~PluginResourceTracker() {
+#ifdef ENABLE_PEPPER_THREADING
+  ppapi::ProxyLock::Reset();
+#endif
 }
 
 PP_Resource PluginResourceTracker::PluginResourceForHostResource(
     const HostResource& resource) const {
   HostResourceMap::const_iterator found = host_resource_map_.find(resource);
   if (found == host_resource_map_.end())
     return 0;
   return found->second;
 }
 
@@ skipping 23 matching lines @@
       // the instance was destroyed. In that case the browser-side resource has
       // already been freed correctly on the browser side.
       dispatcher->Send(new PpapiHostMsg_PPBCore_ReleaseResource(
           API_ID_PPB_CORE, object->host_resource()));
     }
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi