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

webkit/plugins/ppapi/host_globals.h

-// 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
 #define WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
 
 #include "base/compiler_specific.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/var_tracker.h"
 #include "webkit/plugins/ppapi/host_var_tracker.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 namespace webkit {
 namespace ppapi {
 
 class PluginInstance;
 class PluginModule;
 
 class HostGlobals : public ::ppapi::PpapiGlobals {
  public:
   HostGlobals();
-  HostGlobals(::ppapi::PpapiGlobals::ForTest);
   virtual ~HostGlobals();
 
   // Getter for the global singleton. Generally, you should use
   // PpapiGlobals::Get() when possible. Use this only when you need some
   // host-specific functionality.
-  inline static HostGlobals* Get() {
-    DCHECK(PpapiGlobals::Get()->IsHostGlobals());
-    return static_cast<HostGlobals*>(PpapiGlobals::Get());
-  }
+  inline static HostGlobals* Get() { return host_globals_; }
 
   // PpapiGlobals implementation.
   virtual ::ppapi::ResourceTracker* GetResourceTracker() OVERRIDE;
   virtual ::ppapi::VarTracker* GetVarTracker() OVERRIDE;
   virtual ::ppapi::CallbackTracker* GetCallbackTrackerForInstance(
       PP_Instance instance) OVERRIDE;
   virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
       PP_Instance inst,
       ::ppapi::ApiID id) OVERRIDE;
   virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
-  virtual base::Lock* GetProxyLock() OVERRIDE;
 
   HostVarTracker* host_var_tracker() {
     return &host_var_tracker_;
   }
 
   // PP_Modules ----------------------------------------------------------------
 
   // Adds a new plugin module to the list of tracked module, and returns a new
   // module handle to identify it.
   PP_Module AddModule(PluginModule* module);
@@ skipping 17 matching lines @@
   void InstanceDeleted(PP_Instance instance);
 
   void InstanceCrashed(PP_Instance instance);
 
   // Returns a pointer to the plugin instance object associated with the given
   // instance handle. The return value will be NULL if the handle is invalid or
   // if the instance has crashed.
   WEBKIT_PLUGINS_EXPORT PluginInstance* GetInstance(PP_Instance instance);
 
  private:
-  // PpapiGlobals overrides.
-  virtual bool IsHostGlobals() const OVERRIDE;
-
   // Per-instance data we track.
   struct InstanceData;
 
   WEBKIT_PLUGINS_EXPORT static HostGlobals* host_globals_;
 
   ::ppapi::ResourceTracker resource_tracker_;
   HostVarTracker host_var_tracker_;
 
   // Tracks all live instances and their associated data.
   typedef std::map<PP_Instance, linked_ptr<InstanceData> > InstanceMap;
   InstanceMap instance_map_;
 
   // Tracks all live modules. The pointers are non-owning, the PluginModule
   // destructor will notify us when the module is deleted.
   typedef std::map<PP_Module, PluginModule*> ModuleMap;
   ModuleMap module_map_;
 
   DISALLOW_COPY_AND_ASSIGN(HostGlobals);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif   // WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_