reland -- Disable animations during aura tests.

ui/gfx/compositor/layer_animation_sequence.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_animation_sequence.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/debug/trace_event.h"
@@ skipping 18 matching lines @@
   FOR_EACH_OBSERVER(LayerAnimationObserver,
                     observers_,
                     DetachedFromSequence(this));
 }
 
 void LayerAnimationSequence::Progress(base::TimeDelta elapsed,
                                       LayerAnimationDelegate* delegate) {
   if (elements_.empty())
     return;
 
+  // We are now animating.
+  is_animating_ = true;
+
   if (is_cyclic_ && duration_ > base::TimeDelta()) {
     // If delta = elapsed - last_start_ is huge, we can skip ahead by complete
     // loops to save time.
     base::TimeDelta delta = elapsed - last_start_;
     int64 k = delta.ToInternalValue() / duration_.ToInternalValue() - 1;
     if (k > 0) {
       last_start_ += base::TimeDelta::FromInternalValue(
           k * duration_.ToInternalValue());
     }
   }
@@ skipping 101 matching lines @@
                     OnLayerAnimationEnded(this));
 }
 
 void LayerAnimationSequence::NotifyAborted() {
   FOR_EACH_OBSERVER(LayerAnimationObserver,
                     observers_,
                     OnLayerAnimationAborted(this));
 }
 
 }  // namespace ui