diff options
Diffstat (limited to 'ui/aura/test/aura_test_helper.cc')
| -rw-r--r-- | ui/aura/test/aura_test_helper.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index a4400bf..7d01d2d 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc @@ -17,6 +17,7 @@ #include "ui/aura/test/test_stacking_client.h" #include "ui/base/test/dummy_input_method.h" #include "ui/compositor/layer_animator.h" +#include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/gfx/screen.h" namespace aura { @@ -29,7 +30,8 @@ AuraTestHelper::AuraTestHelper(MessageLoopForUI* message_loop) DCHECK(message_loop); message_loop_ = message_loop; // Disable animations during tests. - ui::LayerAnimator::set_disable_animations_for_test(true); + zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( + ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); } AuraTestHelper::~AuraTestHelper() { |