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

ash/wm/system_modal_container_layout_manager.h

Index: ash/wm/system_modal_container_layout_manager.h
===================================================================
--- ash/wm/system_modal_container_layout_manager.h	(revision 120096)
+++ ash/wm/system_modal_container_layout_manager.h	(working copy)
@@ -35,7 +35,7 @@
 class ASH_EXPORT SystemModalContainerLayoutManager
     : public aura::LayoutManager,
       public aura::WindowObserver,
-      public ui::ImplicitAnimationObserver,
+      public ui::LayerAnimationObserver,
       public SystemModalContainerEventFilterDelegate {
  public:
   explicit SystemModalContainerLayoutManager(aura::Window* container);
@@ -55,8 +55,13 @@
                                        const char* key,
                                        void* old) OVERRIDE;
 
-  // Overridden from ui::ImplicitAnimationObserver:
-  virtual void OnImplicitAnimationsCompleted() OVERRIDE;
+  // Overridden from ui::LayerAnimationObserver:
+  virtual void OnLayerAnimationEnded(
+      const ui::LayerAnimationSequence* sequence) OVERRIDE;
+  virtual void OnLayerAnimationAborted(
+      const ui::LayerAnimationSequence* sequence) OVERRIDE;
+  virtual void OnLayerAnimationScheduled(
+      const ui::LayerAnimationSequence* sequence) OVERRIDE;
 
   // Overridden from SystemModalContainerEventFilterDelegate:
   virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE;