reland -- Disable animations during aura tests.

ash/drag_drop/drag_drop_controller.h

Index: ash/drag_drop/drag_drop_controller.h
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
index 0f9b257f56237b1a6c895858451c6e76daea49f7..9272257790c1bd03e1293c655e1040a9fb6811d5 100644
--- a/ash/drag_drop/drag_drop_controller.h
+++ b/ash/drag_drop/drag_drop_controller.h
@@ -36,8 +36,8 @@ class DragImageView;
 class ASH_EXPORT DragDropController
     : public aura::client::DragDropClient,
       public aura::EventFilter,
-      public ui::LayerAnimationObserver {
- public:
+      public ui::ImplicitAnimationObserver {
+public:
   DragDropController();
   virtual ~DragDropController();
 
@@ -69,13 +69,8 @@ class ASH_EXPORT DragDropController
  private:
   friend class ash::test::DragDropControllerTest;
 
-  // 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 {}
+  // Implementation of ImplicitAnimationObserver
+  virtual void OnImplicitAnimationsCompleted() OVERRIDE;
 
   // Helper method to start drag widget flying back animation.
   void StartCanceledAnimation();