| Index: ash/wm/window_animations_unittest.cc
|
| diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
|
| index 0e1a4d8b24d3553cb1b3c08093f60230dc0f8ad9..d2ebb59c7902fb9891a0ef2beda5a8c7f0cc9a2b 100644
|
| --- a/ash/wm/window_animations_unittest.cc
|
| +++ b/ash/wm/window_animations_unittest.cc
|
| @@ -65,6 +65,9 @@ class MinimizeAnimationObserver : public ui::LayerAnimationObserver {
|
| };
|
|
|
| TEST_F(WindowAnimationsTest, HideShowBrightnessGrayscaleAnimation) {
|
| + ui::ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| +
|
| scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
|
| window->Show();
|
| EXPECT_TRUE(window->layer()->visible());
|
| @@ -110,8 +113,8 @@ TEST_F(WindowAnimationsTest, LayerTargetVisibility) {
|
| namespace wm {
|
|
|
| TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
|
| - ui::ScopedAnimationDurationScaleMode normal_duration_mode(
|
| - ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ui::ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
|
|
| scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
|
| window->SetBounds(gfx::Rect(5, 10, 320, 240));
|
| @@ -168,8 +171,8 @@ TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
|
| } // namespace wm
|
|
|
| TEST_F(WindowAnimationsTest, LockAnimationDuration) {
|
| - ui::ScopedAnimationDurationScaleMode normal_duration_mode(
|
| - ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ui::ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
|
|
| scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
|
| Layer* layer = window->layer();
|
|
|