1 files changed, 3 insertions, 2 deletions
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
index 2f9d95c..a8646b6 100644
--- a/ash/wm/window_animations_unittest.cc
+++ b/ash/wm/window_animations_unittest.cc
@@ -13,6 +13,7 @@
 #include "ui/base/animation/animation_container_element.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
+#include "ui/compositor/scoped_animation_duration_scale_mode.h"
 
 using aura::Window;
 using ui::Layer;
@@ -25,7 +26,6 @@ class WindowAnimationsTest : public ash::test::AshTestBase {
   WindowAnimationsTest() {}
 
   virtual void TearDown() OVERRIDE {
-    ui::LayerAnimator::set_disable_animations_for_test(true);
     AshTestBase::TearDown();
   }
 
@@ -80,7 +80,8 @@ TEST_F(WindowAnimationsTest, LayerTargetVisibility) {
 }
 
 TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
-  ui::LayerAnimator::set_disable_animations_for_test(false);
+  ui::ScopedAnimationDurationScaleMode normal_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(5, 10, 320, 240));