reland -- Disable animations during aura tests.

ash/drag_drop/drag_drop_controller.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/drag_drop/drag_drop_controller.h"
 
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "base/message_loop.h"
 #include "ui/aura/client/drag_drop_delegate.h"
@@ skipping 10 matching lines @@
 
 namespace ash {
 namespace internal {
 
 using aura::RootWindow;
 
 namespace {
 const gfx::Point kDragDropWidgetOffset(0, 0);
 const base::TimeDelta kDragDropAnimationDuration =
     base::TimeDelta::FromMilliseconds(250);
-}
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DragDropController, public:
 
 DragDropController::DragDropController()
     : aura::EventFilter(RootWindow::GetInstance()),
       drag_image_(NULL),
       drag_data_(NULL),
       drag_operation_(0),
       dragged_window_(NULL),
       drag_drop_in_progress_(false),
       should_block_during_drag_drop_(true) {
   Shell::GetInstance()->AddRootWindowEventFilter(this);
   aura::client::SetDragDropClient(this);
 }
 
 DragDropController::~DragDropController() {
   Shell::GetInstance()->RemoveRootWindowEventFilter(this);
   Cleanup();
-  if (drag_image_.get()) {
-    aura::Window* window = drag_image_->GetWidget()->GetNativeView();
-    window->layer()->GetAnimator()->RemoveObserver(this);
+  if (drag_image_.get())
     drag_image_.reset();
-  }
 }
 
 int DragDropController::StartDragAndDrop(const ui::OSExchangeData& data,
                                           int operation) {
   DCHECK(!drag_drop_in_progress_);
   aura::Window* capture_window = RootWindow::GetInstance()->capture_window();
   if (capture_window)
     RootWindow::GetInstance()->ReleaseCapture(capture_window);
   drag_drop_in_progress_ = true;
 
@@ skipping 134 matching lines @@
 
 ui::GestureStatus DragDropController::PreHandleGestureEvent(
     aura::Window* target,
     aura::GestureEvent* event) {
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DragDropController, private:
 
-void DragDropController::OnLayerAnimationEnded(
-    const ui::LayerAnimationSequence* sequence) {
+void DragDropController::OnImplicitAnimationsCompleted() OVERRIDE {
   DCHECK(drag_image_.get());
   drag_image_.reset();
 }
-
-void DragDropController::OnLayerAnimationAborted(
-    const ui::LayerAnimationSequence* sequence) {
-  DCHECK(drag_image_.get());
-  drag_image_.reset();
-}
 
 void DragDropController::StartCanceledAnimation() {
   aura::Window* window = drag_image_->GetWidget()->GetNativeView();
   ui::LayerAnimator* animator = window->layer()->GetAnimator();
   animator->set_preemption_strategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
-  animator->AddObserver(this);
+
+  // Stop waiting for any as yet unfinished implicit animations.
+  SetActive(false);
+  animator->RemoveObserver(this);
+
   ui::ScopedLayerAnimationSettings animation_setter(animator);
   animation_setter.SetTransitionDuration(kDragDropAnimationDuration);
+  animation_setter.AddObserver(this);
   window->SetBounds(gfx::Rect(drag_start_location_, window->bounds().size()));
 }
 
 void DragDropController::Cleanup() {
   drag_data_ = NULL;
   drag_drop_in_progress_ = false;
 }
 
 }  // namespace internal
 }  // namespace ash