Revert 189518 "PPAPI: Remove threading options; it's always on"

This is an experimental revert to see if it helps with imaging-darkroom on Kraken.

BUG=222741,159240,92909

> PPAPI: Remove threading options; it's always on
> 
> This also re-enables thread checking for the host side resource and var trackers. Before, checking was disabled everywhere.
> 
> BUG=159240,92909
> 
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=186925
> Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=186939 due to build errors
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187340
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187427
> Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=187668 due to a failing check in Canary, which was fixed here: https://src.chromium.org/viewvc/chrome?view=rev&revision=187681
> 
> Review URL: https://chromiumcodereview.appspot.com/12378050

TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/12920003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189682 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 12 deletions

diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 9034d8f..00947e3 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -171,8 +171,6 @@ Dispatcher* PluginProxyTestHarness::GetDispatcher() {
 void PluginProxyTestHarness::SetUpHarness() {
   // These must be first since the dispatcher set-up uses them.
   CreatePluginGlobals();
-  // Some of the methods called during set-up check that the lock is held.
-  ProxyAutoLock lock;
 
   resource_tracker().DidCreateInstance(pp_instance());
 
@@ -198,8 +196,6 @@ void PluginProxyTestHarness::SetUpHarnessWithChannel(
     bool is_client) {
   // These must be first since the dispatcher set-up uses them.
   CreatePluginGlobals();
-  // Some of the methods called during set-up check that the lock is held.
-  ProxyAutoLock lock;
 
   resource_tracker().DidCreateInstance(pp_instance());
   plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
@@ -218,15 +214,10 @@ void PluginProxyTestHarness::SetUpHarnessWithChannel(
 }
 
 void PluginProxyTestHarness::TearDownHarness() {
-  {
-    // Some of the methods called during tear-down check that the lock is held.
-    ProxyAutoLock lock;
-
-    plugin_dispatcher_->DidDestroyInstance(pp_instance());
-    plugin_dispatcher_.reset();
+  plugin_dispatcher_->DidDestroyInstance(pp_instance());
+  plugin_dispatcher_.reset();
 
-    resource_tracker().DidDeleteInstance(pp_instance());
-  }
+  resource_tracker().DidDeleteInstance(pp_instance());
   plugin_globals_.reset();
 }