Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: ui/views/animation/ink_drop_impl_unittest.cc

Issue 2514293003: Fixed flaky InkDropImpl death test. (Closed)
Patch Set: Uncommented the fix. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_impl_unittest.cc
diff --git a/ui/views/animation/ink_drop_impl_unittest.cc b/ui/views/animation/ink_drop_impl_unittest.cc
index 2ca8042e924f129ad4c219aa7580ae817d617b23..8b9336c9a85d8626e303a711ac44bda766e46e6e 100644
--- a/ui/views/animation/ink_drop_impl_unittest.cc
+++ b/ui/views/animation/ink_drop_impl_unittest.cc
@@ -233,11 +233,9 @@ TEST_F(InkDropImplTest, LayersArentRemovedWhenPreemptingFadeOut) {
}
#if DCHECK_IS_ON()
-TEST_F(InkDropImplTest, SettingHighlightStateDuringStateExitIsntAllowed) {
- // This test uses a death assert, which works by forking the process. That
- // doesn't work well with mus.
- if (ViewsTestBase::IsAuraMusClient() || ViewsTestBase::IsMus())
- return;
+TEST_F(InkDropImplTest,
+ SettingHighlightStateDuringStateExitIsntAllowedDeathTest) {
+ ::testing::FLAGS_gtest_death_test_style = "threadsafe";
test::InkDropImplTestApi::SetStateOnExitHighlightState::Install(
test_api()->state_factory());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698