diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 20:33:12 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 20:33:12 +0000 |
| commit | 7d792aba8f7c901d11820f25cd014ec43435ad02 (patch) | |
| tree | 2bc384bba93afd793a9e73e89b81a6d7696a7079 /ppapi/proxy/ppp_instance_private_proxy_unittest.cc | |
| parent | cccb13dbf6a113811ae68c96c30b65491dd9427d (diff) | |
| download | chromium_src-7d792aba8f7c901d11820f25cd014ec43435ad02.zip chromium_src-7d792aba8f7c901d11820f25cd014ec43435ad02.tar.gz chromium_src-7d792aba8f7c901d11820f25cd014ec43435ad02.tar.bz2 | |
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
Diffstat (limited to 'ppapi/proxy/ppp_instance_private_proxy_unittest.cc')
| -rw-r--r-- | ppapi/proxy/ppp_instance_private_proxy_unittest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc index 317f4d4..df1af0c 100644 --- a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc +++ b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc @@ -147,7 +147,15 @@ class PPP_Instance_Private_ProxyTest : public TwoWayTest { } // namespace +// TODO(raymes): This #ifdef is only here because we check the state of the +// plugin globals on the main thread, rather than the plugin thread which causes +// the thread checker to fail. Once ENABLE_PEPPER_THREADING is the default, +// this will be safe to do anyway, so we can remove this. +#ifdef ENABLE_PEPPER_THREADING TEST_F(PPP_Instance_Private_ProxyTest, PPPInstancePrivate) { +#else +TEST_F(PPP_Instance_Private_ProxyTest, DISABLED_PPPInstancePrivate) { +#endif // This test controls its own instance; we can't use the one that // PluginProxyTestHarness provides. ASSERT_NE(kInstance, pp_instance()); |