| Index: ash/system/toast/toast_manager_unittest.cc
|
| diff --git a/ash/system/toast/toast_manager_unittest.cc b/ash/system/toast/toast_manager_unittest.cc
|
| index 86dad5242a181f000d97338bc1907e5f471a3947..5fef6c28b4687f91e6a1b0a5daba3acfe7493379 100644
|
| --- a/ash/system/toast/toast_manager_unittest.cc
|
| +++ b/ash/system/toast/toast_manager_unittest.cc
|
| @@ -128,6 +128,10 @@ TEST_F(ToastManagerTest, ShowAndCloseManually) {
|
| }
|
|
|
| TEST_F(ToastManagerTest, ShowAndCloseManuallyDuringAnimation) {
|
| + // TODO: gets wedged running animator. http://crbug.com/698016.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| ui::ScopedAnimationDurationScaleMode slow_animation_duration(
|
| ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
|
|
|
| @@ -255,6 +259,10 @@ TEST_F(ToastManagerTest, PositionWithVisibleLeftShelf) {
|
| }
|
|
|
| TEST_F(ToastManagerTest, PositionWithUnifiedDesktop) {
|
| + // TODO: needs unified mode. http://crbug.com/698024.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| display_manager()->SetUnifiedDesktopEnabled(true);
|
| UpdateDisplay("1000x500,0+600-100x500");
|
|
|
|
|