Use ink drop hover for focus states on toolbar buttons and location

ui/views/controls/button/custom_button_unittest.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/custom_button.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 96 matching lines @@
       case InkDropState::ACTION_TRIGGERED:
       case InkDropState::ALTERNATE_ACTION_TRIGGERED:
       case InkDropState::DEACTIVATED:
         break;
     }
   }
 
   void SnapToActivated() override { *ink_shown_ = true; }
 
   void SetHovered(bool is_hovered) override {}
+  InkDrop* GetInkDrop() override { return nullptr; }
 
  private:
   bool* ink_shown_;
   bool* ink_hidden_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInkDropDelegateThatTracksVisibilty);
 };
 
 // A test Button class that owns a TestInkDropDelegate.
 class TestButtonWithInkDrop : public TestCustomButton {
  public:
   TestButtonWithInkDrop(std::unique_ptr<InkDropDelegate> ink_drop_delegate)
-      : TestCustomButton(), ink_drop_delegate_(std::move(ink_drop_delegate)) {
-    set_ink_drop_delegate(ink_drop_delegate_.get());
+      : TestCustomButton() {
+    set_ink_drop_delegate(std::move(ink_drop_delegate));
   }
   ~TestButtonWithInkDrop() override {}
 
  private:
-  std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_;
-
   DISALLOW_COPY_AND_ASSIGN(TestButtonWithInkDrop);
 };
 
 }  // namespace
 
 class CustomButtonTest : public ViewsTestBase {
  public:
   CustomButtonTest() {}
   ~CustomButtonTest() override {}
 
@@ skipping 331 matching lines @@
   ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_TRUE(ink_drop_delegate->is_hovered());
   EXPECT_EQ(InkDropState::ACTION_PENDING,
             ink_drop_delegate->GetTargetInkDropState());
 }
 
 }  // namespace views