PPAPI: Purposely leak ProxyLock, fix shutdown race

content/renderer/pepper/host_globals.h

 // Copyright (c) 2012 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 CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
 #define CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
 
 #include "base/compiler_specific.h"
 #include "content/renderer/pepper/host_var_tracker.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"
 
 namespace content {
 
 class PepperPluginInstanceImpl;
 class PluginModule;
 
 class HostGlobals : public ppapi::PpapiGlobals {
  public:
   HostGlobals();
-  explicit HostGlobals(ppapi::PpapiGlobals::PerThreadForTest);
   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());
   }
 
   // PpapiGlobals implementation.
   virtual ppapi::ResourceTracker* GetResourceTracker() OVERRIDE;
   virtual ppapi::VarTracker* GetVarTracker() OVERRIDE;
   virtual ppapi::CallbackTracker* GetCallbackTrackerForInstance(
       PP_Instance instance) OVERRIDE;
   virtual ppapi::thunk::PPB_Instance_API* GetInstanceAPI(
       PP_Instance instance) OVERRIDE;
   virtual ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI(
       PP_Instance instance) OVERRIDE;
   virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
   virtual std::string GetCmdLine() OVERRIDE;
   virtual void PreCacheFontForFlash(const void* logfontw) OVERRIDE;
-  virtual base::Lock* GetProxyLock() OVERRIDE;
   virtual void LogWithSource(PP_Instance instance,
                              PP_LogLevel level,
                              const std::string& source,
                              const std::string& value) OVERRIDE;
   virtual void BroadcastLogWithSource(PP_Module module,
                                       PP_LogLevel level,
                                       const std::string& source,
                                       const std::string& value) OVERRIDE;
   virtual ppapi::MessageLoopShared* GetCurrentMessageLoop() OVERRIDE;
   virtual base::TaskRunner* GetFileTaskRunner(PP_Instance instance) OVERRIDE;
@@ skipping 50 matching lines @@
   // 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 content
 
 #endif   // CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_