reland -- Disable animations during aura tests.

ash/test/aura_shell_test_base.cc

Index: ash/test/aura_shell_test_base.cc
diff --git a/ash/test/aura_shell_test_base.cc b/ash/test/aura_shell_test_base.cc
index b6011de812ab0608e7328e5dec0e60d0d20c6b03..1486f1cad9eeb2f6d3c90b675045be9ebe66fb24 100644
--- a/ash/test/aura_shell_test_base.cc
+++ b/ash/test/aura_shell_test_base.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
+#include "ui/gfx/compositor/layer_animator.h"
 
 namespace ash {
 namespace test {
@@ -21,6 +22,9 @@ void AuraShellTestBase::SetUp() {
 
   // Creates Shell and hook with Desktop.
   ash::Shell::CreateInstance(new TestShellDelegate);
+
+  // Disable animations during tests.
+  ui::LayerAnimator::set_disable_animations_for_test(true);
 }
 
 void AuraShellTestBase::TearDown() {