PPAPI: Make tests that disable the proxy lock re-enable it

ppapi/shared_impl/proxy_lock.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_SHARED_IMPL_PROXY_LOCK_H_
 #define PPAPI_SHARED_IMPL_PROXY_LOCK_H_
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 41 matching lines @@
   static void AssertAcquired();
   static void AssertAcquiredDebugOnly() {
 #ifndef NDEBUG
     AssertAcquired();
 #endif
   }
 
   // We have some unit tests where one thread pretends to be the host and one
   // pretends to be the plugin. This allows the lock to do nothing on only one
   // thread to support these tests. See TwoWayTest for more information.
-  static void DisableLockingOnThreadForTest();
-
-  // Enables locking on the current thread. Although locking is enabled by
-  // default, unit tests that rely on the lock being enabled should *still*
-  // call this, since a previous test may have disabled locking.
-  static void EnableLockingOnThreadForTest();
+  class PPAPI_SHARED_EXPORT LockingDisablerForTest {
+   public:
+    LockingDisablerForTest();
+    ~LockingDisablerForTest();
+  };
 
  private:
   friend class content::HostGlobals;
   // On the host side, we do not lock. This must be called at most once at
   // startup, before other threads that may access the ProxyLock have had a
   // chance to run.
   static void DisableLocking();
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyLock);
 };
@@ skipping 281 matching lines @@
   internal::RunWhileLockedHelper<FunctionType>* helper =
       new internal::RunWhileLockedHelper<FunctionType>(callback);
   return base::Bind(
       &internal::RunWhileLockedHelper<FunctionType>::CallWhileLocked,
       base::Owned(helper));
 }
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PROXY_LOCK_H_