Fixes ink drop being "stuck" on when losing focus.

ui/views/controls/button/custom_button_unittest.cc

Index: ui/views/controls/button/custom_button_unittest.cc
diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
index 6ffdd81746ca94b555bd111d9a94718c04fed722..b586ab66c1dc8649fea0a3f1715cfb298a24d531 100644
--- a/ui/views/controls/button/custom_button_unittest.cc
+++ b/ui/views/controls/button/custom_button_unittest.cc
@@ -78,7 +78,11 @@ class TestCustomButton : public CustomButton, public ButtonListener {
     canceled_ = false;
   }
 
- private:
+  void OnFocus() override {

[bruthig, 2016/06/02 15:21:35]

nit: a comment here would be useful.  I assume it's to change the visibility
from private to public?

[kylix_rd, 2016/06/02 15:52:33]

Done.

+    CustomButton::OnFocus();
+  }
+
+private:
   bool pressed_ = false;
   bool canceled_ = false;
 
@@ -468,6 +472,29 @@ TEST_F(CustomButtonTest, DontHideInkDropWhenShowingContextMenu) {
             ink_drop_delegate->GetTargetInkDropState());
 }
 
+TEST_F(CustomButtonTest, HideInkDropOnBlur) {
+  gfx::Point center(10, 10);
+
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop_delegate));
+
+  button()->OnFocus();
+
+  button()->OnMousePressed(ui::MouseEvent(
+      ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  EXPECT_EQ(InkDropState::ACTION_PENDING,
+            ink_drop_delegate->GetTargetInkDropState());
+
+  button()->OnBlur();
+  EXPECT_EQ(InkDropState::HIDDEN, ink_drop_delegate->GetTargetInkDropState());
+
+  button()->OnMouseReleased(ui::MouseEvent(
+      ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  EXPECT_TRUE(button()->pressed());
+}
+
 TEST_F(CustomButtonTest, InkDropAfterTryingToShowContextMenu) {
   TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
   CreateButtonWithInkDrop(base::WrapUnique(ink_drop_delegate));