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

ppapi/shared_impl/proxy_lock.cc

 // 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.
 
 #include "ppapi/shared_impl/proxy_lock.h"
 
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_local.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
@@ skipping 61 matching lines @@
   }
 }
 
 // static
 void ProxyLock::DisableLocking() {
   // Note, we don't DCHECK that this flag isn't already set, because multiple
   // unit tests may run in succession and all set it.
   g_disable_locking = true;
 }
 
-// static
-void ProxyLock::DisableLockingOnThreadForTest() {
+ProxyLock::LockingDisablerForTest::LockingDisablerForTest() {
   // Note, we don't DCHECK that this flag isn't already set, because multiple
   // unit tests may run in succession and all set it.
   g_disable_locking_for_thread.Get().Set(true);
 }
 
-// static
-void ProxyLock::EnableLockingOnThreadForTest() {
+ProxyLock::LockingDisablerForTest::~LockingDisablerForTest() {
   g_disable_locking_for_thread.Get().Set(false);
 }
 
 void CallWhileUnlocked(const base::Closure& closure) {
   ProxyAutoUnlock lock;
   closure.Run();
 }
 
 }  // namespace ppapi