reland -- Disable animations during aura tests.

ui/gfx/compositor/layer_animator.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/gfx/compositor/layer_animator.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/animation/animation_container.h"
@@ skipping 27 matching lines @@
       disable_timer_for_test_(false) {
 }
 
 LayerAnimator::~LayerAnimator() {
   for (size_t i = 0; i < running_animations_.size(); ++i)
     running_animations_[i].sequence->OnAnimatorDestroyed();
   ClearAnimations();
 }
 
 // static
+bool LayerAnimator::disable_animations_for_test_ = false;
+
+// static
 LayerAnimator* LayerAnimator::CreateDefaultAnimator() {
   return new LayerAnimator(base::TimeDelta::FromMilliseconds(0));
 }
 
 // static
 LayerAnimator* LayerAnimator::CreateImplicitAnimator() {
   return new LayerAnimator(kDefaultTransitionDuration);
 }
 
 void LayerAnimator::SetTransform(const Transform& transform) {
+  base::TimeDelta duration = transition_duration_;
+  if (disable_animations_for_test_)
+    duration = base::TimeDelta();
   StartAnimation(new LayerAnimationSequence(
       LayerAnimationElement::CreateTransformElement(
-          transform, transition_duration_)));
+          transform, duration)));
 }
 
 Transform LayerAnimator::GetTargetTransform() const {
   LayerAnimationElement::TargetValue target(delegate());
   GetTargetValue(&target);
   return target.transform;
 }
 
 void LayerAnimator::SetBounds(const gfx::Rect& bounds) {
+  base::TimeDelta duration = transition_duration_;
+  if (disable_animations_for_test_)
+    duration = base::TimeDelta();
   StartAnimation(new LayerAnimationSequence(
       LayerAnimationElement::CreateBoundsElement(
-          bounds, transition_duration_)));
+          bounds, duration)));
 }
 
 gfx::Rect LayerAnimator::GetTargetBounds() const {
   LayerAnimationElement::TargetValue target(delegate());
   GetTargetValue(&target);
   return target.bounds;
 }
 
 void LayerAnimator::SetOpacity(float opacity) {
+  base::TimeDelta duration = transition_duration_;
+  if (disable_animations_for_test_)
+    duration = base::TimeDelta();
   StartAnimation(new LayerAnimationSequence(
       LayerAnimationElement::CreateOpacityElement(
-          opacity, transition_duration_)));
+          opacity, duration)));
 }
 
 float LayerAnimator::GetTargetOpacity() const {
   LayerAnimationElement::TargetValue target(delegate());
   GetTargetValue(&target);
   return target.opacity;
 }
 
 void LayerAnimator::SetDelegate(LayerAnimationDelegate* delegate) {
   DCHECK(delegate);
@@ skipping 416 matching lines @@
     ObserverListBase<LayerAnimationObserver>::Iterator it(observers_);
     LayerAnimationObserver* obs;
     while ((obs = it.GetNext()) != NULL) {
       sequence->AddObserver(obs);
     }
   }
   sequence->OnScheduled();
 }
 
 }  // namespace ui