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

ash/app_list/app_list.cc

Index: ash/app_list/app_list.cc
===================================================================
--- ash/app_list/app_list.cc	(revision 120096)
+++ ash/app_list/app_list.cc	(working copy)
@@ -87,6 +87,7 @@
 
   if (is_visible_) {
     widget_ = widget;
+    widget_->AddObserver(this);
     GetLayer(widget_)->GetAnimator()->AddObserver(this);
     Shell::GetInstance()->AddRootWindowEventFilter(this);
 
@@ -118,19 +119,13 @@
     return;
 
   ui::Layer* layer = GetLayer(widget_);
-
-  // Stop observing previous animation.
-  StopObservingImplicitAnimations();
-
   ui::ScopedLayerAnimationSettings app_list_animation(layer->GetAnimator());
-  app_list_animation.AddObserver(this);
   layer->SetBounds(GetPreferredBounds(is_visible_));
   layer->SetOpacity(is_visible_ ? 1.0 : 0.0);
 
   ui::Layer* default_container_layer = default_container->layer();
   ui::ScopedLayerAnimationSettings default_container_animation(
       default_container_layer->GetAnimator());
-  app_list_animation.AddObserver(this);
   default_container_layer->SetOpacity(is_visible_ ? 0.0 : 1.0);
 }
 
@@ -164,13 +159,22 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// AppList, ui::ImplicitAnimationObserver implementation:
+// AppList, ui::LayerAnimationObserver implementation:
 
-void AppList::OnImplicitAnimationsCompleted() {
+void AppList::OnLayerAnimationEnded(
+    const ui::LayerAnimationSequence* sequence) {
   if (!is_visible_ )
     widget_->Close();
 }
 
+void AppList::OnLayerAnimationAborted(
+    const ui::LayerAnimationSequence* sequence) {
+}
+
+void AppList::OnLayerAnimationScheduled(
+    const ui::LayerAnimationSequence* sequence) {
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AppList, views::Widget::Observer implementation: