Added ui::test::MultiLayerAnimatorTestController and Delegate.

ui/views/animation/test/ink_drop_animation_test_api.cc

Index: ui/views/animation/test/ink_drop_animation_test_api.cc
diff --git a/ui/views/animation/test/ink_drop_animation_test_api.cc b/ui/views/animation/test/ink_drop_animation_test_api.cc
index a5714ca37b3ac15eb152d0e3bf3d462b24fef057..86d35a6a7453d74d6cdf44bc2f3aeb50b84a6b04 100644
--- a/ui/views/animation/test/ink_drop_animation_test_api.cc
+++ b/ui/views/animation/test/ink_drop_animation_test_api.cc
@@ -15,48 +15,14 @@ namespace test {
 
 InkDropAnimationTestApi::InkDropAnimationTestApi(
     InkDropAnimation* ink_drop_animation)
-    : ink_drop_animation_(ink_drop_animation) {}
+    : ui::test::MultiLayerAnimatorTestController(this),
+      ink_drop_animation_(ink_drop_animation) {}
 
 InkDropAnimationTestApi::~InkDropAnimationTestApi() {}
 
-void InkDropAnimationTestApi::SetDisableAnimationTimers(bool disable_timers) {
-  for (ui::LayerAnimator* animator : GetLayerAnimators())
-    animator->set_disable_timer_for_test(disable_timers);
-}
-
-bool InkDropAnimationTestApi::HasActiveAnimations() const {
-  for (ui::LayerAnimator* animator : GetLayerAnimators()) {
-    if (animator->is_animating())
-      return true;
-  }
-  return false;
-}
-
-void InkDropAnimationTestApi::CompleteAnimations() {
-  while (HasActiveAnimations()) {
-    // StepAnimations() will only progress the current running animations. Thus
-    // each queued animation will require at least one 'Step' call and we cannot
-    // just use a large duration here.
-    StepAnimations(base::TimeDelta::FromMilliseconds(20));
-  }
-}
-
 std::vector<ui::LayerAnimator*> InkDropAnimationTestApi::GetLayerAnimators() {
-  return static_cast<const InkDropAnimationTestApi*>(this)->GetLayerAnimators();
-}
-
-std::vector<ui::LayerAnimator*> InkDropAnimationTestApi::GetLayerAnimators()
-    const {
   return std::vector<ui::LayerAnimator*>();
 }
 
-void InkDropAnimationTestApi::StepAnimations(const base::TimeDelta& duration) {
-  for (ui::LayerAnimator* animator : GetLayerAnimators()) {
-    ui::LayerAnimatorTestController controller(animator);
-    controller.StartThreadedAnimationsIfNeeded();
-    controller.Step(duration);
-  }
-}
-
 }  // namespace test
 }  // namespace views