PPAPI: Purposely leak ProxyLock, fix shutdown race

ppapi/thunk/enter.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_THUNK_ENTER_H_
 #define PPAPI_THUNK_ENTER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 25 matching lines @@
 // input values are correct (the normal case), this should be set to true. In
 // some case like |IsFoo(PP_Resource)| the caller is questioning whether their
 // handle is this type, and we don't want to report an error if it's not.
 //
 // Resource member functions: EnterResource
 //   Automatically interprets the given PP_Resource as a resource ID and sets
 //   up the resource object for you.
 
 namespace subtle {
 
-// Assert that we are holding the proxy lock.
-PPAPI_THUNK_EXPORT void AssertLockHeld();
-
 // This helps us define our RAII Enter classes easily. To make an RAII class
 // which locks the proxy lock on construction and unlocks on destruction,
 // inherit from |LockOnEntry<true>| before all other base classes. This ensures
 // that the lock is acquired before any other base class's constructor can run,
 // and that the lock is only released after all other destructors have run.
 // (This order of initialization is guaranteed by C++98/C++11 12.6.2.10).
 //
 // For cases where you don't want to lock, inherit from |LockOnEntry<false>|.
 // This allows us to share more code between Enter* and Enter*NoLock classes.
 template <bool lock_on_entry>
 struct LockOnEntry;
 
 template <>
 struct LockOnEntry<false> {
 #if (!NDEBUG)
   LockOnEntry() {
     // You must already hold the lock to use Enter*NoLock.
-    AssertLockHeld();
+    ProxyLock::AssertAcquired();
   }
   ~LockOnEntry() {
     // You must not release the lock before leaving the scope of the
     // Enter*NoLock.
-    AssertLockHeld();
+    ProxyLock::AssertAcquired();
   }
 #endif
 };
 
 template <>
 struct LockOnEntry<true> {
   LockOnEntry() {
     ppapi::ProxyLock::Acquire();
   }
   ~LockOnEntry() {
@@ skipping 242 matching lines @@
   ResourceCreationAPI* functions() { return functions_; }
 
  private:
   ResourceCreationAPI* functions_;
 };
 
 }  // namespace thunk
 }  // namespace ppapi
 
 #endif  // PPAPI_THUNK_ENTER_H_