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

ui/views/controls/button/menu_button_unittest.cc

 // Copyright 2014 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/menu_button.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 22 matching lines @@
 class TestMenuButton : public MenuButton {
  public:
   explicit TestMenuButton(MenuButtonListener* menu_button_listener)
       : MenuButton(base::string16(ASCIIToUTF16("button")),
                    menu_button_listener,
                    false) {}
 
   ~TestMenuButton() override {}
 
   // Accessors to protected MenuButton methods.
-  void set_ink_drop_delegate(InkDropDelegate* ink_drop_delegate) {
-    MenuButton::set_ink_drop_delegate(ink_drop_delegate);
+  void set_ink_drop_delegate(
+      std::unique_ptr<InkDropDelegate> ink_drop_delegate) {
+    InkDropHostView::set_ink_drop_delegate(std::move(ink_drop_delegate));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestMenuButton);
 };
 
 class MenuButtonTest : public ViewsTestBase {
  public:
   MenuButtonTest() : widget_(nullptr), button_(nullptr) {}
   ~MenuButtonTest() override {}
@@ skipping 370 matching lines @@
   generator()->PressLeftButton();
   EXPECT_EQ(nullptr, menu_button_listener.last_source());
 
   generator()->ReleaseLeftButton();
   EXPECT_EQ(button(), menu_button_listener.last_source());
   EXPECT_EQ(Button::STATE_HOVERED, menu_button_listener.last_source_state());
 }
 
 TEST_F(MenuButtonTest, InkDropStateForMenuButtonActivationsWithoutListener) {
   CreateMenuButtonWithNoListener();
-  TestInkDropDelegate ink_drop_delegate;
-  ink_drop_delegate.OnAction(InkDropState::ACTION_PENDING);
-  button()->set_ink_drop_delegate(&ink_drop_delegate);
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
+  button()->set_ink_drop_delegate(base::WrapUnique(ink_drop_delegate));
   button()->Activate(nullptr);
 
-  EXPECT_EQ(InkDropState::HIDDEN, ink_drop_delegate.GetTargetInkDropState());
+  EXPECT_EQ(InkDropState::HIDDEN, ink_drop_delegate->GetTargetInkDropState());
 }
 
 TEST_F(MenuButtonTest,
        InkDropStateForMenuButtonActivationsWithListenerThatDoesntAcquireALock) {
   TestMenuButtonListener menu_button_listener;
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
-  TestInkDropDelegate ink_drop_delegate;
-  button()->set_ink_drop_delegate(&ink_drop_delegate);
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  button()->set_ink_drop_delegate(base::WrapUnique(ink_drop_delegate));
   button()->Activate(nullptr);
 
   EXPECT_EQ(InkDropState::ACTION_TRIGGERED,
-            ink_drop_delegate.GetTargetInkDropState());
+            ink_drop_delegate->GetTargetInkDropState());
 }
 
 TEST_F(
     MenuButtonTest,
     InkDropStateForMenuButtonActivationsWithListenerThatDontReleaseAllLocks) {
   PressStateMenuButtonListener menu_button_listener(false);
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
   menu_button_listener.set_menu_button(button());
-  TestInkDropDelegate ink_drop_delegate;
-  button()->set_ink_drop_delegate(&ink_drop_delegate);
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  button()->set_ink_drop_delegate(base::WrapUnique(ink_drop_delegate));
   button()->Activate(nullptr);
 
-  EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.GetTargetInkDropState());
-
-  // Prevent the button from accessing invalid memory during clean up.
-  button()->set_ink_drop_delegate(nullptr);
+  EXPECT_EQ(InkDropState::ACTIVATED,
+            ink_drop_delegate->GetTargetInkDropState());
 }
 
 TEST_F(MenuButtonTest,
        InkDropStateForMenuButtonActivationsWithListenerThatReleaseAllLocks) {
   PressStateMenuButtonListener menu_button_listener(true);
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
   menu_button_listener.set_menu_button(button());
-  TestInkDropDelegate ink_drop_delegate;
-  button()->set_ink_drop_delegate(&ink_drop_delegate);
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  button()->set_ink_drop_delegate(base::WrapUnique(ink_drop_delegate));
   button()->Activate(nullptr);
 
   EXPECT_EQ(InkDropState::DEACTIVATED,
-            ink_drop_delegate.GetTargetInkDropState());
+            ink_drop_delegate->GetTargetInkDropState());
 }
 
 TEST_F(MenuButtonTest, InkDropStateForMenuButtonsWithPressedLocks) {
   CreateMenuButtonWithNoListener();
-  TestInkDropDelegate ink_drop_delegate;
-  button()->set_ink_drop_delegate(&ink_drop_delegate);
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  button()->set_ink_drop_delegate(base::WrapUnique(ink_drop_delegate));
 
   std::unique_ptr<MenuButton::PressedLock> pressed_lock1(
       new MenuButton::PressedLock(button()));
 
-  EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.GetTargetInkDropState());
+  EXPECT_EQ(InkDropState::ACTIVATED,
+            ink_drop_delegate->GetTargetInkDropState());
 
   std::unique_ptr<MenuButton::PressedLock> pressed_lock2(
       new MenuButton::PressedLock(button()));
 
-  EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.GetTargetInkDropState());
+  EXPECT_EQ(InkDropState::ACTIVATED,
+            ink_drop_delegate->GetTargetInkDropState());
 
   pressed_lock1.reset();
-  EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.GetTargetInkDropState());
+  EXPECT_EQ(InkDropState::ACTIVATED,
+            ink_drop_delegate->GetTargetInkDropState());
 
   pressed_lock2.reset();
   EXPECT_EQ(InkDropState::DEACTIVATED,
-            ink_drop_delegate.GetTargetInkDropState());
+            ink_drop_delegate->GetTargetInkDropState());
 }
 
 // Verifies only one ink drop animation is triggered when multiple PressedLocks
 // are attached to a MenuButton.
 TEST_F(MenuButtonTest, OneInkDropAnimationForReentrantPressedLocks) {
   CreateMenuButtonWithNoListener();
-  TestInkDropDelegate ink_drop_delegate;
-  button()->set_ink_drop_delegate(&ink_drop_delegate);
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  button()->set_ink_drop_delegate(base::WrapUnique(ink_drop_delegate));
 
   std::unique_ptr<MenuButton::PressedLock> pressed_lock1(
       new MenuButton::PressedLock(button()));
 
-  EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.GetTargetInkDropState());
-  ink_drop_delegate.OnAction(InkDropState::ACTION_PENDING);
+  EXPECT_EQ(InkDropState::ACTIVATED,
+            ink_drop_delegate->GetTargetInkDropState());
+  ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
 
   std::unique_ptr<MenuButton::PressedLock> pressed_lock2(
       new MenuButton::PressedLock(button()));
 
   EXPECT_EQ(InkDropState::ACTION_PENDING,
-            ink_drop_delegate.GetTargetInkDropState());
+            ink_drop_delegate->GetTargetInkDropState());
 }
 
 // Verifies the InkDropState is left as ACTIVATED if a PressedLock is active
 // before another Activation occurs.
 TEST_F(MenuButtonTest,
        InkDropStateForMenuButtonWithPressedLockBeforeActivation) {
   TestMenuButtonListener menu_button_listener;
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
-  TestInkDropDelegate ink_drop_delegate;
-  button()->set_ink_drop_delegate(&ink_drop_delegate);
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  button()->set_ink_drop_delegate(base::WrapUnique(ink_drop_delegate));
   MenuButton::PressedLock lock(button());
 
   button()->Activate(nullptr);
 
-  EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.GetTargetInkDropState());
+  EXPECT_EQ(InkDropState::ACTIVATED,
+            ink_drop_delegate->GetTargetInkDropState());
 }
 
 #if defined(USE_AURA)
 
 // Tests that the MenuButton does not become pressed if it can be dragged, and a
 // DragDropClient is processing the events.
 TEST_F(MenuButtonTest, DraggableMenuButtonDoesNotActivateOnDrag) {
   TestMenuButtonListener menu_button_listener;
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
   TestDragController drag_controller;
@@ skipping 58 matching lines @@
   generator()->MoveTouch(gfx::Point(10, 30));
   generator()->ReleaseTouch();
   EXPECT_EQ(Button::STATE_NORMAL, button()->state());
   EXPECT_EQ(nullptr, menu_button_listener.last_source());
 }
 
 #endif  // !defined(OS_MACOSX) || defined(USE_AURA)
 
 }  // namespace views
 }  // namespace test