Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

ui/views/animation/test/test_ink_drop_host.h

Index: ui/views/animation/test/test_ink_drop_host.h
diff --git a/ui/views/animation/test/test_ink_drop_host.h b/ui/views/animation/test/test_ink_drop_host.h
index b952b77adb815240e34283de12182abb097571da..e287c4ad260ac17b0f104e7d0e0b25f5e9716e64 100644
--- a/ui/views/animation/test/test_ink_drop_host.h
+++ b/ui/views/animation/test/test_ink_drop_host.h
@@ -10,19 +10,26 @@
 
 namespace views {
 
-// A non-functional, dummy implementation of an InkDropHost that can be used as
-// a placeholder during tests.
+// A non-functional, implementation of an InkDropHost that can be used as during

[Peter Kasting, 2015/12/18 18:44:02]

Nit: While here: Remove comma; remove "as"

[bruthig, 2015/12/21 16:54:34]

Done.

+// tests.  Tracks the current number of ink drop layers being hosted.

[Peter Kasting, 2015/12/18 18:44:02]

Nit: "Tracks the number of hosted ink drop layers"?

[bruthig, 2015/12/21 16:54:34]

Done.

 class TestInkDropHost : public InkDropHost {
  public:
   TestInkDropHost();
   ~TestInkDropHost() override;
 
+  int current_number_of_ink_drop_layers() const {

[Peter Kasting, 2015/12/18 18:44:02]

Nit: I would name all these like "num_ink_drop_layers()".

[bruthig, 2015/12/21 16:54:34]

Done.

+    return current_number_of_ink_drop_layers_;
+  }
+
   // TestInkDropHost:
   void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
   void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
   gfx::Point CalculateInkDropCenter() const override;
 
  private:
+  // The number of ink drop layers currently hosted by this.

[Peter Kasting, 2015/12/18 18:44:02]

Nit: Comment adds nothing to the code, remove.

[bruthig, 2015/12/21 16:54:34]

Done.

+  int current_number_of_ink_drop_layers_;
+
   DISALLOW_COPY_AND_ASSIGN(TestInkDropHost);
 };