Index: ui/aura/test/aura_test_base.cc |
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc |
index 70d33f53cf62995ff0793defcdbca234929f85ec..3e1e95f4db1fd548842f54760af148b930204b2e 100644 |
--- a/ui/aura/test/aura_test_base.cc |
+++ b/ui/aura/test/aura_test_base.cc |
@@ -9,6 +9,7 @@ |
#endif |
#include "ui/aura/root_window.h" |
+#include "ui/gfx/compositor/layer_animator.h" |
namespace aura { |
namespace test { |
@@ -22,6 +23,9 @@ AuraTestBase::AuraTestBase() |
RootWindow::GetInstance()->Show(); |
RootWindow::GetInstance()->SetHostSize(gfx::Size(600, 600)); |
+ |
+ // Disable animations during tests. |
+ ui::LayerAnimator::set_disable_animations_for_test(true); |
} |
AuraTestBase::~AuraTestBase() { |