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

ash/wm/compact_layout_manager.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 "ash/wm/compact_layout_manager.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 122 matching lines @@
       ShouldAnimateOnEntrance(window)) {
     LayoutWindows(current_window_);
     current_window_ = window;
     AnimateSlideTo(window->bounds().x());
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // CompactLayoutManager, AnimationDelegate overrides:
 
-void CompactLayoutManager::OnImplicitAnimationsCompleted() {
+void CompactLayoutManager::OnLayerAnimationEnded(
+    const ui::LayerAnimationSequence* animation) {
   if (!GetDefaultContainerLayer()->GetAnimator()->is_animating())
     HideWindows();
 }
 
+void CompactLayoutManager::OnLayerAnimationScheduled(
+    const ui::LayerAnimationSequence* animation) {
+}
+
+void CompactLayoutManager::OnLayerAnimationAborted(
+    const ui::LayerAnimationSequence* animation) {
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // CompactLayoutManager, private:
 
 void CompactLayoutManager::UpdateStatusAreaVisibility() {
   if (!status_area_widget_)
     return;
   // Full screen windows should hide the status area widget.
   bool has_fullscreen = window_util::HasFullscreenWindow(windows());
   bool widget_visible = status_area_widget_->IsVisible();
   if (has_fullscreen && widget_visible)
@@ skipping 64 matching lines @@
   if (windows_list.size() > 1 && const_it != windows_list.end()) {
     if (++const_it != windows_list.end())
       return *const_it;
     return *windows_list.begin();
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace ash