diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 03:58:09 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 03:58:09 +0000 |
commit | f9bc5791e39b5602b7f41716a177c8dc64ca6f00 (patch) | |
tree | 05057334fdd68e952fa47a401d7076241063b3fb /ppapi/proxy/ppapi_proxy_test.cc | |
parent | 205e88d6758032258564a8f514b27dd1fa3c5c5e (diff) | |
download | chromium_src-f9bc5791e39b5602b7f41716a177c8dc64ca6f00.zip chromium_src-f9bc5791e39b5602b7f41716a177c8dc64ca6f00.tar.gz chromium_src-f9bc5791e39b5602b7f41716a177c8dc64ca6f00.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_proxy_test.cc')
-rw-r--r-- | ppapi/proxy/ppapi_proxy_test.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index 00947e3..9034d8f 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc @@ -171,6 +171,8 @@ 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()); @@ -196,6 +198,8 @@ 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); @@ -214,10 +218,15 @@ void PluginProxyTestHarness::SetUpHarnessWithChannel( } void PluginProxyTestHarness::TearDownHarness() { - plugin_dispatcher_->DidDestroyInstance(pp_instance()); - plugin_dispatcher_.reset(); + { + // Some of the methods called during tear-down check that the lock is held. + ProxyAutoLock lock; + + plugin_dispatcher_->DidDestroyInstance(pp_instance()); + plugin_dispatcher_.reset(); - resource_tracker().DidDeleteInstance(pp_instance()); + resource_tracker().DidDeleteInstance(pp_instance()); + } plugin_globals_.reset(); } |