| Index: ppapi/shared_impl/proxy_lock.cc
|
| diff --git a/ppapi/shared_impl/proxy_lock.cc b/ppapi/shared_impl/proxy_lock.cc
|
| index 6598379ca8b74f8b5f72ce47b7f121dcc3d583eb..cd302f9dcc6b9f85d1ad6350892b5101d3385df5 100644
|
| --- a/ppapi/shared_impl/proxy_lock.cc
|
| +++ b/ppapi/shared_impl/proxy_lock.cc
|
| @@ -79,15 +79,13 @@ void ProxyLock::DisableLocking() {
|
| 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);
|
| }
|
|
|
|
|