PPAPI: Purposely leak ProxyLock, fix shutdown race

ppapi/proxy/plugin_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 PPAPI_PROXY_PLUGIN_GLOBALS_H_
 #define PPAPI_PROXY_PLUGIN_GLOBALS_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
 #include "base/threading/thread_local_storage.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 
 namespace base {
 class Thread;
@@ skipping 34 matching lines @@
   virtual VarTracker* GetVarTracker() OVERRIDE;
   virtual CallbackTracker* GetCallbackTrackerForInstance(
       PP_Instance instance) OVERRIDE;
   virtual thunk::PPB_Instance_API* GetInstanceAPI(
       PP_Instance instance) OVERRIDE;
   virtual 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 MessageLoopShared* GetCurrentMessageLoop() OVERRIDE;
   base::TaskRunner* GetFileTaskRunner(PP_Instance instance) OVERRIDE;
@@ skipping 58 matching lines @@
   // PpapiGlobals overrides.
   virtual bool IsPluginGlobals() const OVERRIDE;
 
   static PluginGlobals* plugin_globals_;
 
   PluginProxyDelegate* plugin_proxy_delegate_;
   PluginResourceTracker plugin_resource_tracker_;
   PluginVarTracker plugin_var_tracker_;
   scoped_refptr<CallbackTracker> callback_tracker_;
 
-  base::Lock proxy_lock_;
-
   scoped_ptr<base::ThreadLocalStorage::Slot> msg_loop_slot_;
   // Note that loop_for_main_thread's constructor sets msg_loop_slot_, so it
   // must be initialized after msg_loop_slot_ (hence the order here).
   scoped_refptr<MessageLoopResource> loop_for_main_thread_;
 
   // Name of the plugin used for error logging. This will be empty until
   // set_plugin_name is called.
   std::string plugin_name_;
 
   // Command line for the plugin. This will be empty until set_command_line is
   // called.
   std::string command_line_;
 
   scoped_ptr<BrowserSender> browser_sender_;
 
   // Thread for performing potentially blocking file operations. It's created
   // lazily, since it might not be needed.
   scoped_ptr<base::Thread> file_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginGlobals);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif   // PPAPI_PROXY_PLUGIN_GLOBALS_H_