Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #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 {
 
 // A test delegate for a toolbar action view.
 class TestToolbarActionViewDelegate : public ToolbarActionView::Delegate {
  public:
   TestToolbarActionViewDelegate() : shown_in_menu_(false),
                                     overflow_reference_view_(nullptr),
                                     web_contents_(nullptr) {}
@@ skipping 106 matching lines @@
   TestToolbarActionView(ToolbarActionViewController* view_controller,
                         Delegate* delegate)
       : ToolbarActionView(view_controller, delegate) {}
 
   ~TestToolbarActionView() override {}
 
  private:
   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");
   TestToolbarActionViewDelegate action_view_delegate;
 
   // Create a new toolbar action view.
   std::unique_ptr<ToolbarActionView> view(
       new ToolbarActionView(&controller, &action_view_delegate));
   view->set_owned_by_client();
   view->SetBoundsRect(gfx::Rect(0, 0, 200, 20));
@@ skipping 121 matching lines @@
   // If the view isn't visible, the overflow button should be pressed for
   // popups.
   view.SetVisible(false);
   controller.ShowPopup(true);
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_PRESSED, overflow_button.state());
   controller.HidePopup();
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_NORMAL, overflow_button.state());
 }