Revert 120092 - Reland 120074 -- Disable animations during aura tests.

ui/gfx/compositor/scoped_layer_animation_settings.h

Index: ui/gfx/compositor/scoped_layer_animation_settings.h
===================================================================
--- ui/gfx/compositor/scoped_layer_animation_settings.h	(revision 120096)
+++ ui/gfx/compositor/scoped_layer_animation_settings.h	(working copy)
@@ -27,13 +27,15 @@
   explicit ScopedLayerAnimationSettings(LayerAnimator* animator);
   virtual ~ScopedLayerAnimationSettings();
 
-  void AddObserver(ImplicitAnimationObserver* observer);
+  void AddObserver(LayerAnimationObserver* observer);
+  void AddImplicitObserver(ImplicitAnimationObserver* observer);
   void SetTransitionDuration(base::TimeDelta duration);
 
  private:
   LayerAnimator* animator_;
   base::TimeDelta old_transition_duration_;
-  std::set<ImplicitAnimationObserver*> observers_;
+  std::set<LayerAnimationObserver*> observers_;
+  std::set<ImplicitAnimationObserver*> implicit_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings);
 };