diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:18:41 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:18:41 +0000 |
| commit | 460d2fd0876fddb9e6a2a17cba9c70beb93dfa03 (patch) | |
| tree | 4e0cf902613ff0a64a7fa69959e48a0160bbf2f2 /ppapi/proxy/ppp_instance_private_proxy_unittest.cc | |
| parent | b26ac3b182b8c63192ad1f8e221ceac3fe5927be (diff) | |
| download | chromium_src-460d2fd0876fddb9e6a2a17cba9c70beb93dfa03.zip chromium_src-460d2fd0876fddb9e6a2a17cba9c70beb93dfa03.tar.gz chromium_src-460d2fd0876fddb9e6a2a17cba9c70beb93dfa03.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: 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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191420 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, 0 insertions, 8 deletions
diff --git a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc index df1af0c..317f4d4 100644 --- a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc +++ b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc @@ -147,15 +147,7 @@ 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()); |