reland -- Disable animations during aura tests.

ui/gfx/compositor/scoped_layer_animation_settings.h

Index: ui/gfx/compositor/scoped_layer_animation_settings.h
diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.h b/ui/gfx/compositor/scoped_layer_animation_settings.h
index 2f900552fe62d8d094690886310c832a18a92b2a..090802a5686efeee30e9683518dea1a04f2cfcb5 100644
--- a/ui/gfx/compositor/scoped_layer_animation_settings.h
+++ b/ui/gfx/compositor/scoped_layer_animation_settings.h
@@ -28,14 +28,12 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {
   virtual ~ScopedLayerAnimationSettings();
 
   void AddObserver(LayerAnimationObserver* observer);
-  void AddImplicitObserver(ImplicitAnimationObserver* observer);
   void SetTransitionDuration(base::TimeDelta duration);
 
  private:
   LayerAnimator* animator_;
   base::TimeDelta old_transition_duration_;
   std::set<LayerAnimationObserver*> observers_;
-  std::set<ImplicitAnimationObserver*> implicit_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings);
 };