Enabled tests to control material design ink drop animations.

ui/views/animation/test/test_ink_drop_host.cc

Index: ui/views/animation/test/test_ink_drop_host.cc
diff --git a/ui/views/animation/test/test_ink_drop_host.cc b/ui/views/animation/test/test_ink_drop_host.cc
index 5b46b0da280527e5f37fce203d3894c117154b66..ca15b88a81062e754ce42e01c26c0c4be944d936 100644
--- a/ui/views/animation/test/test_ink_drop_host.cc
+++ b/ui/views/animation/test/test_ink_drop_host.cc
@@ -2,15 +2,80 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ui/views/animation/test/test_ink_drop_host.h"
+
+#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/animation/ink_drop_hover.h"
 #include "ui/views/animation/square_ink_drop_animation.h"
-#include "ui/views/animation/test/test_ink_drop_host.h"
+#include "ui/views/animation/test/ink_drop_hover_test_api.h"
+#include "ui/views/animation/test/square_ink_drop_animation_test_api.h"
 
 namespace views {
 
+namespace {
+
+// Test specific subclass of InkDropAnimation that returns a test api from
+// GetTestApi().
+class TestInkDropAnimation : public SquareInkDropAnimation {
+ public:
+  TestInkDropAnimation(const gfx::Size& large_size,
+                       int large_corner_radius,
+                       const gfx::Size& small_size,
+                       int small_corner_radius,
+                       const gfx::Point& center_point,
+                       SkColor color)
+      : SquareInkDropAnimation(large_size,
+                               large_corner_radius,
+                               small_size,
+                               small_corner_radius,
+                               center_point,
+                               color) {}
+
+  ~TestInkDropAnimation() override {}
+
+  test::InkDropAnimationTestApi* GetTestApi() override {
+    if (!test_api_)
+      test_api_.reset(new test::SquareInkDropAnimationTestApi(this));
+    return test_api_.get();
+  }
+
+ private:
+  scoped_ptr<test::InkDropAnimationTestApi> test_api_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestInkDropAnimation);
+};
+
+// Test specific subclass of InkDropHover that returns a test api from
+// GetTestApi().
+class TestInkDropHover : public InkDropHover {
+ public:
+  TestInkDropHover(const gfx::Size& size,
+                   int corner_radius,
+                   const gfx::Point& center_point,
+                   SkColor color)
+      : InkDropHover(size, corner_radius, center_point, color) {}
+
+  ~TestInkDropHover() override {}
+
+  test::InkDropHoverTestApi* GetTestApi() override {
+    if (!test_api_)
+      test_api_.reset(new test::InkDropHoverTestApi(this));
+    return test_api_.get();
+  }
+
+ private:
+  scoped_ptr<test::InkDropHoverTestApi> test_api_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestInkDropHover);
+};
+
+}  // namespace
+
 TestInkDropHost::TestInkDropHost()
-    : num_ink_drop_layers_(0), should_show_hover_(false) {}
+    : num_ink_drop_layers_(0),
+      should_show_hover_(false),
+      disable_timers_for_test_(false) {}
 
 TestInkDropHost::~TestInkDropHost() {}
 
@@ -24,15 +89,22 @@ void TestInkDropHost::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
 
 scoped_ptr<InkDropAnimation> TestInkDropHost::CreateInkDropAnimation() const {
   gfx::Size size(10, 10);
-  return make_scoped_ptr(new SquareInkDropAnimation(
-      size, 5, size, 5, gfx::Point(), SK_ColorBLACK));
+  scoped_ptr<InkDropAnimation> animation(
+      new TestInkDropAnimation(size, 5, size, 5, gfx::Point(), SK_ColorBLACK));
+  if (disable_timers_for_test_)
+    animation->GetTestApi()->SetDisableAnimationTimers(true);
+  return animation;
 }
 
 scoped_ptr<InkDropHover> TestInkDropHost::CreateInkDropHover() const {
-  return should_show_hover_
-             ? make_scoped_ptr(new InkDropHover(gfx::Size(10, 10), 4,
-                                                gfx::Point(), SK_ColorBLACK))
-             : nullptr;
+  scoped_ptr<InkDropHover> hover;
+  if (should_show_hover_) {
+    hover.reset(new TestInkDropHover(gfx::Size(10, 10), 4, gfx::Point(),
+                                     SK_ColorBLACK));
+    if (disable_timers_for_test_)
+      hover->GetTestApi()->SetDisableAnimationTimers(true);
+  }
+  return hover;
 }
 
 }  // namespace views