| Index: ash/wm/overview/window_selector_unittest.cc
|
| diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
|
| index dddfeb1203646474a79b927e1fb1462d0ad0aee9..9663dcfef3be64b0ede011c6827d43853e57c6ab 100644
|
| --- a/ash/wm/overview/window_selector_unittest.cc
|
| +++ b/ash/wm/overview/window_selector_unittest.cc
|
| @@ -458,15 +458,15 @@ TEST_F(WindowSelectorTest, DISABLED_MinimizedWindowVisibility) {
|
| EXPECT_FALSE(window1->IsVisible());
|
| EXPECT_FALSE(window1->layer()->GetTargetVisibility());
|
| {
|
| - ui::ScopedAnimationDurationScaleMode normal_duration_mode(
|
| - ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ui::ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| ToggleOverview();
|
| EXPECT_TRUE(window1->IsVisible());
|
| EXPECT_TRUE(window1->layer()->GetTargetVisibility());
|
| }
|
| {
|
| - ui::ScopedAnimationDurationScaleMode normal_duration_mode(
|
| - ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ui::ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| ToggleOverview();
|
| EXPECT_FALSE(window1->IsVisible());
|
| EXPECT_FALSE(window1->layer()->GetTargetVisibility());
|
| @@ -561,8 +561,8 @@ TEST_F(WindowSelectorTest, QuickReentryRestoresInitialTransform) {
|
| // animating when we reenter. We cannot short circuit animations for this but
|
| // we also don't have to wait for them to complete.
|
| {
|
| - ui::ScopedAnimationDurationScaleMode normal_duration_mode(
|
| - ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ui::ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| ToggleOverview();
|
| ToggleOverview();
|
| }
|
|
|