Enabled tests to control material design ink drop animations.

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 b8d44e4d0904220c72d2582b06d0b92678449267..611f3d7d4507502d540be2e6e6ae0295e8b7f77a 100644
--- a/ui/views/animation/test/ink_drop_animation_test_api.h
+++ b/ui/views/animation/test/ink_drop_animation_test_api.h
@@ -21,8 +21,9 @@ class InkDropAnimation;
 
 namespace test {
 
-// Base Test API used by test fixtures to validate all concrete implementations
-// of the InkDropAnimation class.
+// Test API to provide internal access to an InkDropAnimation instance. This can
+// also be used to control the animations via the
+// ui::test::MultiLayerAnimatorTestController API.
 class InkDropAnimationTestApi
     : public ui::test::MultiLayerAnimatorTestController,
       public ui::test::MultiLayerAnimatorTestControllerDelegate {
@@ -33,6 +34,9 @@ class InkDropAnimationTestApi
   // Gets the opacity of the ink drop.
   virtual float GetCurrentOpacity() const = 0;
 
+  // MultiLayerAnimatorTestControllerDelegate:
+  std::vector<ui::LayerAnimator*> GetLayerAnimators() override;
+
  protected:
   InkDropAnimation* ink_drop_animation() {
     return static_cast<const InkDropAnimationTestApi*>(this)
@@ -41,9 +45,6 @@ class InkDropAnimationTestApi
 
   InkDropAnimation* ink_drop_animation() const { return ink_drop_animation_; }
 
-  // MultiLayerAnimatorTestControllerDelegate:
-  std::vector<ui::LayerAnimator*> GetLayerAnimators() override;
-
  private:
   // The InkDropedAnimation to provide internal access to.
   InkDropAnimation* ink_drop_animation_;