reland -- Disable animations during aura tests.

ash/wm/visibility_controller_unittest.cc

Index: ash/wm/visibility_controller_unittest.cc
diff --git a/ash/wm/visibility_controller_unittest.cc b/ash/wm/visibility_controller_unittest.cc
index aaa15a500325d0b13c66a28181574e9ead7acb2a..9fb10249afd191e2ec29cb43fd93f06593d4c5ab 100644
--- a/ash/wm/visibility_controller_unittest.cc
+++ b/ash/wm/visibility_controller_unittest.cc
@@ -8,6 +8,7 @@
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
+#include "ui/gfx/compositor/layer_animator.h"
 
 namespace ash {
 namespace internal {
@@ -17,6 +18,9 @@ typedef test::AuraShellTestBase VisibilityControllerTest;
 // Hiding a window in an animatable container should not hide the window's layer
 // immediately.
 TEST_F(VisibilityControllerTest, AnimateHideDoesntHideWindowLayer) {
+  // We cannot disable animations for this test.
+  ui::LayerAnimator::set_disable_animations_for_test(false);
+
   scoped_ptr<aura::Window> container(
       aura::test::CreateTestWindowWithId(-1, NULL));
   SetChildWindowVisibilityChangesAnimated(container.get());