Fixed interactive ui test regression

BUG=617056

Review-Url: https://codereview.chromium.org/2034893003
Cr-Commit-Position: refs/heads/master@{#397822}

chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc

@@ -296,17 +296,10 @@ IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest,
       browser()->tab_strip_model()->GetActiveWebContents()->GetVisibleURL());
 }
 
-// TODO(crbug.com/617056) Flaky on Win 7.
-#if defined(OS_WIN)
-#define MAYBE_DoubleClickToolbarActionToClose \
-  DISABLED_DoubleClickToolbarActionToClose
-#else
-#define MAYBE_DoubleClickToolbarActionToClose DoubleClickToolbarActionToClose
-#endif
 // Tests that clicking on the toolbar action a second time when the action is
 // already open results in closing the popup, and doesn't re-open it.
 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest,
-                       MAYBE_DoubleClickToolbarActionToClose) {
+                       DoubleClickToolbarActionToClose) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup")));
   base::RunLoop().RunUntilIdle();  // Ensure the extension is fully loaded.

ui/views/controls/button/custom_button.cc

@@ -167,14 +167,14 @@ bool CustomButton::OnMouseDragged(const ui::MouseEvent& event) {
     if (HitTestPoint(event.location())) {
       SetState(ShouldEnterPushedState(event) ? STATE_PRESSED : STATE_HOVERED);
       if (!InDrag() && ink_drop_delegate() &&
-          ink_drop_delegate()->GetTargetInkDropState() !=
-              views::InkDropState::ACTION_PENDING)
+          ink_drop_delegate()->GetTargetInkDropState() ==
+              views::InkDropState::HIDDEN)
         ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
     } else {
       SetState(STATE_NORMAL);
       if (!InDrag() && ink_drop_delegate() &&
-          ink_drop_delegate()->GetTargetInkDropState() !=
-              views::InkDropState::HIDDEN)
+          ink_drop_delegate()->GetTargetInkDropState() ==
+              views::InkDropState::ACTION_PENDING)
         ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
     }
   }