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

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

Issue 2500973002: Converts test_wm to use aura (Closed)
Patch Set: reference bug 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 | « services/ui/test_wm/test_wm.cc ('k') | ui/views/mus/input_method_mus_unittest.cc » ('j') | 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 c0725ff9e2b02bdfe75b128d3f49eb0e84adfba4..2ca8042e924f129ad4c219aa7580ae817d617b23 100644
--- a/ui/views/animation/ink_drop_impl_unittest.cc
+++ b/ui/views/animation/ink_drop_impl_unittest.cc
@@ -14,6 +14,7 @@
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/views/animation/test/ink_drop_impl_test_api.h"
#include "ui/views/animation/test/test_ink_drop_host.h"
+#include "ui/views/test/views_test_base.h"
namespace views {
@@ -233,6 +234,11 @@ 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::InkDropImplTestApi::SetStateOnExitHighlightState::Install(
test_api()->state_factory());
ASSERT_DEATH_IF_SUPPORTED(
« no previous file with comments | « services/ui/test_wm/test_wm.cc ('k') | ui/views/mus/input_method_mus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698