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

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 60 matching lines @@
   }
 
   bool pressed() { return pressed_; }
   bool canceled() { return canceled_; }
 
   void Reset() {
     pressed_ = false;
     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;
 
   DISALLOW_COPY_AND_ASSIGN(TestCustomButton);
 };
 
 // An InkDropDelegate that keeps track of ink drop visibility.
 class TestInkDropDelegateThatTracksVisibilty : public TestInkDropDelegate {
  public:
   TestInkDropDelegateThatTracksVisibilty(bool* ink_shown, bool* ink_hidden)
@@ skipping 369 matching lines @@
   ink_drop_delegate->SetHovered(true);
   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());
 }
 
+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));
   button()->set_context_menu_controller(nullptr);
 
   ink_drop_delegate->SetHovered(true);
   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