Added ui::test::MultiLayerAnimatorTestController and Delegate.

ui/views/animation/test/ink_drop_animation_test_api.h

Index: ui/views/animation/test/ink_drop_animation_test_api.h
diff --git a/ui/views/animation/test/ink_drop_animation_test_api.h b/ui/views/animation/test/ink_drop_animation_test_api.h
index 1b64f6e9d3650629b0acd1c22fd95aa7d3035127..b8d44e4d0904220c72d2582b06d0b92678449267 100644
--- a/ui/views/animation/test/ink_drop_animation_test_api.h
+++ b/ui/views/animation/test/ink_drop_animation_test_api.h
@@ -9,6 +9,8 @@
 
 #include "base/macros.h"
 #include "base/time/time.h"
+#include "ui/compositor/test/multi_layer_animator_test_controller.h"
+#include "ui/compositor/test/multi_layer_animator_test_controller_delegate.h"
 
 namespace ui {
 class LayerAnimator;
@@ -21,19 +23,12 @@ namespace test {
 
 // Base Test API used by test fixtures to validate all concrete implementations
 // of the InkDropAnimation class.
-class InkDropAnimationTestApi {
+class InkDropAnimationTestApi
+    : public ui::test::MultiLayerAnimatorTestController,
+      public ui::test::MultiLayerAnimatorTestControllerDelegate {
  public:
   explicit InkDropAnimationTestApi(InkDropAnimation* ink_drop_animation);
-  virtual ~InkDropAnimationTestApi();
-
-  // Disables the animation timers when |disable_timers| is true.
-  void SetDisableAnimationTimers(bool disable_timers);
-
-  // Returns true if any animations are active.
-  bool HasActiveAnimations() const;
-
-  // Completes all animations for all the Layer's owned by the InkDropAnimation.
-  void CompleteAnimations();
+  ~InkDropAnimationTestApi() override;
 
   // Gets the opacity of the ink drop.
   virtual float GetCurrentOpacity() const = 0;
@@ -46,18 +41,10 @@ class InkDropAnimationTestApi {
 
   InkDropAnimation* ink_drop_animation() const { return ink_drop_animation_; }
 
-  // Get a list of all the LayerAnimator's used internally by the
-  // InkDropAnimation.
-  std::vector<ui::LayerAnimator*> GetLayerAnimators();
-  virtual std::vector<ui::LayerAnimator*> GetLayerAnimators() const;
+  // MultiLayerAnimatorTestControllerDelegate:
+  std::vector<ui::LayerAnimator*> GetLayerAnimators() override;
 
  private:
-  // Progresses all running LayerAnimationSequences by the given |duration|.
-  //
-  // NOTE: This function will NOT progress LayerAnimationSequences that are
-  // queued, only the running ones will be progressed.
-  void StepAnimations(const base::TimeDelta& duration);
-
   // The InkDropedAnimation to provide internal access to.
   InkDropAnimation* ink_drop_animation_;