Revert of PPAPI: Make tests that disable the proxy lock re-enable it (patchset #2 id:20001 of https://codereview.chromium.org/908363002/)

Reason for revert:
Broke tests on Linux:
https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29%2832%29/builds/9607

Original issue's description:
> PPAPI: Make tests that disable the proxy lock re-enable it
>
> Rather than force all unit tests that rely on the ProxyLock to enable it,
> let's make sure that all tests that _disable_ it re-enable it on exit.
>
> BUG=
> R=teravest@chromium.org
>
> Committed: https://crrev.com/25ea5b2087b4c31fa42dea9b0de759d4895d0612
> Cr-Commit-Position: refs/heads/master@{#315666}

TBR=teravest@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/918433002

Cr-Commit-Position: refs/heads/master@{#315686}

4 files changed, 7 insertions, 2 deletions

diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 8827610..acd533f 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -229,8 +229,12 @@ void PluginProxyTestHarness::CreatePluginGlobals() {
   if (globals_config_ == PER_THREAD_GLOBALS) {
     plugin_globals_.reset(new PluginGlobals(PpapiGlobals::PerThreadForTest()));
     PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
+    // Enable locking in case some other unit test ran before us and disabled
+    // locking.
+    ProxyLock::EnableLockingOnThreadForTest();
   } else {
     plugin_globals_.reset(new PluginGlobals());
+    ProxyLock::EnableLockingOnThreadForTest();
   }
 }
 
@@ -456,8 +460,6 @@ void HostProxyTestHarness::SetUpHarnessWithChannel(
 void HostProxyTestHarness::TearDownHarness() {
   HostDispatcher::RemoveForInstance(pp_instance());
   host_dispatcher_.reset();
-  // Set the proxy lock back to the default, which is locking.
-  ProxyLock::EnableLockingOnThreadForTest();
   host_globals_.reset();
 }
 
diff --git a/ppapi/proxy/raw_var_data_unittest.cc b/ppapi/proxy/raw_var_data_unittest.cc
index 7dba345..e1c56a3 100644
--- a/ppapi/proxy/raw_var_data_unittest.cc
+++ b/ppapi/proxy/raw_var_data_unittest.cc
@@ -38,6 +38,7 @@ class RawVarDataTest : public testing::Test {
 
   // testing::Test implementation.
   virtual void SetUp() {
+    ProxyLock::EnableLockingOnThreadForTest();
     ProxyLock::Acquire();
   }
   virtual void TearDown() {
diff --git a/ppapi/shared_impl/tracked_callback_unittest.cc b/ppapi/shared_impl/tracked_callback_unittest.cc
index 12ad423..1819947 100644
--- a/ppapi/shared_impl/tracked_callback_unittest.cc
+++ b/ppapi/shared_impl/tracked_callback_unittest.cc
@@ -26,6 +26,7 @@ class TrackedCallbackTest : public testing::Test {
   PP_Instance pp_instance() const { return pp_instance_; }
 
   virtual void SetUp() override {
+    ProxyLock::EnableLockingOnThreadForTest();
     ProxyAutoLock lock;
     globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
   }
diff --git a/ppapi/shared_impl/var_tracker_unittest.cc b/ppapi/shared_impl/var_tracker_unittest.cc
index fb8fda3..fc089ab 100644
--- a/ppapi/shared_impl/var_tracker_unittest.cc
+++ b/ppapi/shared_impl/var_tracker_unittest.cc
@@ -42,6 +42,7 @@ class VarTrackerTest : public testing::Test {
   // Test implementation.
   virtual void SetUp() override {
     ASSERT_EQ(0, mock_var_alive_count);
+    ProxyLock::EnableLockingOnThreadForTest();
   }
   virtual void TearDown() override {}