reland -- Disable animations during aura tests.

ui/gfx/compositor/layer_animator.cc

Index: ui/gfx/compositor/layer_animator.cc
diff --git a/ui/gfx/compositor/layer_animator.cc b/ui/gfx/compositor/layer_animator.cc
index 82aa94966b42ac2ec183a5d0b02649d3a98a2d51..f98904cfd22c99c710f45b573da2cccc1e220266 100644
--- a/ui/gfx/compositor/layer_animator.cc
+++ b/ui/gfx/compositor/layer_animator.cc
@@ -45,6 +45,9 @@ LayerAnimator::~LayerAnimator() {
 }
 
 // static
+bool LayerAnimator::disable_animations_for_test_ = false;
+
+// static
 LayerAnimator* LayerAnimator::CreateDefaultAnimator() {
   return new LayerAnimator(base::TimeDelta::FromMilliseconds(0));
 }
@@ -55,9 +58,12 @@ LayerAnimator* LayerAnimator::CreateImplicitAnimator() {
 }
 
 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 {
@@ -67,9 +73,12 @@ Transform LayerAnimator::GetTargetTransform() const {
 }
 
 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 {
@@ -79,9 +88,12 @@ gfx::Rect LayerAnimator::GetTargetBounds() const {
 }
 
 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 {