Index: ash/shelf/shelf_layout_manager_unittest.cc |
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc |
index a6182ec016a8847785ca3194c10ebb8248d54292..a7144a51bd9e3d123368815003ee4f051a5cabb5 100644 |
--- a/ash/shelf/shelf_layout_manager_unittest.cc |
+++ b/ash/shelf/shelf_layout_manager_unittest.cc |
@@ -1701,7 +1701,7 @@ TEST_F(ShelfLayoutManagerTest, ShelfAnimatesWhenGestureComplete) { |
{ |
// Enable animations so that we can make sure that they occur. |
ui::ScopedAnimationDurationScaleMode regular_animations( |
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); |
ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); |
gfx::Rect shelf_bounds_in_screen = |
@@ -1730,7 +1730,7 @@ TEST_F(ShelfLayoutManagerTest, ShelfAnimatesWhenGestureComplete) { |
{ |
// Enable the animations so that we can make sure they do occur. |
ui::ScopedAnimationDurationScaleMode regular_animations( |
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); |
gfx::Point start = |
GetShelfWidget()->GetWindowBoundsInScreen().CenterPoint(); |