Added ink drop hover/ripple to menu hosting bookmark buttons.

ui/views/animation/ink_drop_animation_controller_impl_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 "ui/views/animation/ink_drop_animation_controller_impl.h"
 
 #include "base/macros.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 52 matching lines @@
   ink_drop_host_.set_should_show_hover(true);
 
   ink_drop_animation_controller_.SetHovered(true);
   EXPECT_TRUE(is_hover_fading_in_or_visible());
 
   ink_drop_animation_controller_.SetHovered(false);
   EXPECT_FALSE(is_hover_fading_in_or_visible());
 }
 
 TEST_F(InkDropAnimationControllerImplTest,
-       HoveredStateAfterHoverTimerFiresWhenHostIsHovered) {
+       HoverDoesntFadeInAfterAnimationIfHoverNotSet) {
   ink_drop_host_.set_should_show_hover(true);
+  ink_drop_animation_controller_.SetHovered(false);
+  ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);
+
+  EXPECT_FALSE(task_runner_->HasPendingTask());
+  EXPECT_FALSE(is_hover_fading_in_or_visible());
+}
+
+TEST_F(InkDropAnimationControllerImplTest,
+       HoverFadesInAfterAnimationWhenHostIsHovered) {
+  ink_drop_host_.set_should_show_hover(true);
+  ink_drop_animation_controller_.SetHovered(true);
   ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);
 
   EXPECT_TRUE(task_runner_->HasPendingTask());
 
   task_runner_->RunPendingTasks();
 
   EXPECT_TRUE(is_hover_fading_in_or_visible());
 }
 
 TEST_F(InkDropAnimationControllerImplTest,
-       HoveredStateAfterHoverTimerFiresWhenHostIsNotHovered) {
+       HoverDoesntFadeInAfterAnimationWhenHostIsNotHovered) {
   ink_drop_host_.set_should_show_hover(false);
+  ink_drop_animation_controller_.SetHovered(true);
   ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);
 
   EXPECT_TRUE(task_runner_->HasPendingTask());
 
   task_runner_->RunPendingTasks();
 
   EXPECT_FALSE(is_hover_fading_in_or_visible());
 }
 
 TEST_F(InkDropAnimationControllerImplTest,
@@ skipping 11 matching lines @@
 // returns null for the hover.
 TEST_F(InkDropAnimationControllerImplTest,
        SetHoveredFalseWorksWhenNoInkDropHoverExists) {
   ink_drop_host_.set_should_show_hover(false);
   ink_drop_animation_controller_.SetHovered(true);
   EXPECT_FALSE(hover());
   ink_drop_animation_controller_.SetHovered(false);
   EXPECT_FALSE(hover());
 }
 
+TEST_F(InkDropAnimationControllerImplTest, HoverFadesOutOnSnapToActivated) {
+  ink_drop_host_.set_should_show_hover(true);
+  ink_drop_animation_controller_.SetHovered(true);
+
+  EXPECT_TRUE(is_hover_fading_in_or_visible());
+
+  ink_drop_animation_controller_.SnapToActivated();
+
+  EXPECT_FALSE(is_hover_fading_in_or_visible());
+}
+
 }  // namespace views