reland -- Disable animations during aura tests.

ui/aura/test/aura_test_base.cc

 // 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.
 
 #include "ui/aura/test/aura_test_base.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif
 
 #include "ui/aura/root_window.h"
+#include "ui/gfx/compositor/layer_animator.h"
 
 namespace aura {
 namespace test {
 
 AuraTestBase::AuraTestBase()
     : setup_called_(false),
       teardown_called_(false) {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
 
   RootWindow::GetInstance()->Show();
   RootWindow::GetInstance()->SetHostSize(gfx::Size(600, 600));
+
+  // Disable animations during tests.
+  ui::LayerAnimator::set_disable_animations_for_test(true);
 }
 
 AuraTestBase::~AuraTestBase() {
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
   CHECK(setup_called_)
       << "You have overridden SetUp but never called super class's SetUp";
   CHECK(teardown_called_)
       << "You have overridden TearDown but never called super class's TearDown";
@@ skipping 19 matching lines @@
 
 void AuraTestBase::RunAllPendingInMessageLoop() {
 #if !defined(OS_MACOSX)
   message_loop_.RunAllPendingWithDispatcher(
       RootWindow::GetInstance()->GetDispatcher());
 #endif
 }
 
 }  // namespace test
 }  // namespace aura