diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 20:27:16 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 20:27:16 +0000 |
| commit | 41e52fb588e0ced58dc1e6d93797a0e54004be27 (patch) | |
| tree | 22d45dd235be4f70f5492793f8b7fcc23ef76b21 /ppapi/proxy/ppp_instance_private_proxy_unittest.cc | |
| parent | 69ceabd3799404eed6bda5d3f03a795b0d174931 (diff) | |
| download | chromium_src-41e52fb588e0ced58dc1e6d93797a0e54004be27.zip chromium_src-41e52fb588e0ced58dc1e6d93797a0e54004be27.tar.gz chromium_src-41e52fb588e0ced58dc1e6d93797a0e54004be27.tar.bz2 | |
Revert 191420 "PPAPI: Remove threading options; it's always on"
> 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: r186925
> Reverted: r186939 due to build errors
>
> Committed: r187340
>
> Committed: r187427
> Reverted: r187668 due to a failing check in Canary, which was fixed here: r187681
>
> Committed: r189518
> Reverted: r189682, due to regression in Kraken (see crbug.com/222741)
>
> Review URL: https://chromiumcodereview.appspot.com/12378050
TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/13328006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191441 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()); |