diff options
| author | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 11:10:10 +0000 |
|---|---|---|
| committer | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 11:10:10 +0000 |
| commit | 0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce (patch) | |
| tree | a44e550a178c8abb56f84ee53ac597beeca85896 /ppapi/proxy/ppp_instance_private_proxy_unittest.cc | |
| parent | 4867eb0439663745aace33be72575cbe09608a59 (diff) | |
| download | chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.zip chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.tar.gz chromium_src-0dfb613d4dc52d0de7b95efe71d935ef12fbd4ce.tar.bz2 | |
Revert 186925 since it breaks many of the builds on the bots (e.g.
http://build.chromium.org/p/chromium.perf/builders/Win%20Builder/builds/45240/steps/compile/logs/stdio).
> 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
>
>
> Review URL: https://chromiumcodereview.appspot.com/12378050
TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/12504007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186939 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()); |