Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc

Index: chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
index 84f2449ac21ddc43d18facd96cd7cb252cd4d0bd..8c6c7df7223ac1f56de14bad63b0604e438134d8 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
@@ -15,7 +15,6 @@
 #include "content/public/test/test_web_contents_factory.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/views/animation/test/test_ink_drop_delegate.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace {
@@ -142,8 +141,8 @@ class TestToolbarActionView : public ToolbarActionView {
   DISALLOW_COPY_AND_ASSIGN(TestToolbarActionView);
 };
 
-// Verifies there is no crash when a ToolbarActionView with an InkDropDelegate
-// is destroyed while holding a |pressed_lock_|.
+// Verifies there is no crash when a ToolbarActionView with an InkDrop is
+// destroyed while holding a |pressed_lock_|.
 TEST_F(ToolbarActionViewUnitTest,
        NoCrashWhenDestroyingToolbarActionViewThatHasAPressedLock) {
   TestToolbarActionViewController controller("fake controller");