Remove find bar focus redirection on mouse events.

chrome/browser/ui/views/find_bar_views_interactive_uitest.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 "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 13 matching lines @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 
 using base::ASCIIToUTF16;
 using content::WebContents;
 
 namespace {
-
 static const char kSimplePage[] = "/find_in_page/simple.html";
+}  // namespace
 
 class FindInPageTest : public InProcessBrowserTest {
  public:
   FindInPageTest() {
     FindBarHost::disable_animations_during_testing_ = true;
   }
 
   base::string16 GetFindBarText() {
     FindBar* find_bar = browser()->GetFindBarController()->find_bar();
     return find_bar->GetFindText();
   }
 
   base::string16 GetFindBarSelectedText() {
     FindBarTesting* find_bar =
         browser()->GetFindBarController()->find_bar()->GetFindBarTesting();
     return find_bar->GetFindSelectedText();
   }
 
+  FindBarView* GetFindBarView() const {

[Peter Kasting, 2016/06/18 01:13:25]

Nit: Make pointer const or remove const qualifier

[msw, 2016/06/18 01:28:59]

Done.

+    FindBar* find_bar = browser()->GetFindBarController()->find_bar();
+    return static_cast<FindBarHost*>(find_bar)->find_bar_view();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(FindInPageTest);
 };
 
-}  // namespace
-
 // Flaky because the test server fails to start? See: http://crbug.com/96594.
 IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // First we navigate to our test page (tab A).
   GURL url = embedded_test_server()->GetURL(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   chrome::Find(browser());
 
@@ skipping 53 matching lines @@
       true, false, NULL, NULL);
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_TAB, false,
                                               false, false, false));
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_RETURN, false,
                                               false, false, false));
   EXPECT_TRUE(
       ui_test_utils::IsViewFocused(browser(),
       VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON));
 }
 
-// TODO(mpistrich): Enable again when ui_test_utils::ClickOnView works with find
-// bar view IDs.
-// http://crbug.com/584043
-IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_NavigationByMouse) {
+IN_PROC_BROWSER_TEST_F(FindInPageTest, NoFocusChangesOnClick) {
   ASSERT_TRUE(embedded_test_server()->Start());
   // Make sure Chrome is in the foreground, otherwise sending input
   // won't do anything and the test will hang.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   // First we navigate to any page.
   ui_test_utils::NavigateToURL(browser(),
                                embedded_test_server()->GetURL(kSimplePage));
   // Show the Find bar.
   browser()->GetFindBarController()->Show();
   EXPECT_TRUE(
       ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   ui_test_utils::FindInPage(
       browser()->tab_strip_model()->GetActiveWebContents(), ASCIIToUTF16("a"),
       true, false, NULL, NULL);
+  EXPECT_TRUE(
+      ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
-  // The textfield should be focused after clicking on any button.
-  ui_test_utils::ClickOnView(browser(), VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON);
+  views::View* find_bar_view = GetFindBarView();
+  views::View* previous_button =
+      find_bar_view->GetViewByID(VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON);
+  views::View* next_button =
+      find_bar_view->GetViewByID(VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON);
+
+  // Clicking the next and previous buttons should not alter the focused view.
+  ui_test_utils::MoveMouseToCenterAndPress(previous_button, ui_controls::LEFT,
+                                           ui_controls::DOWN | ui_controls::UP,
+                                           base::Closure());
   EXPECT_TRUE(
-      ui_test_utils::IsViewFocused(browser(),
-      VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
+      ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
+  ui_test_utils::MoveMouseToCenterAndPress(next_button, ui_controls::LEFT,
+                                           ui_controls::DOWN | ui_controls::UP,
+                                           base::Closure());
+  EXPECT_TRUE(
+      ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
-  // The textfield should be focused after clicking on any button.
-  ui_test_utils::ClickOnView(browser(), VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON);
-  EXPECT_TRUE(
-      ui_test_utils::IsViewFocused(browser(),
-      VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
+  // Clicking next shouldn't change focus, even if previous is focused.
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_TAB, false,
+                                              false, false, false));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(
+      browser(), VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON));
+  ui_test_utils::MoveMouseToCenterAndPress(next_button, ui_controls::LEFT,
+                                           ui_controls::DOWN | ui_controls::UP,
+                                           base::Closure());
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(
+      browser(), VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON));
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, ButtonsDisabledWithoutText) {
   ASSERT_TRUE(embedded_test_server()->Start());
   // Make sure Chrome is in the foreground, otherwise sending input
   // won't do anything and the test will hang.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   // First we navigate to any page.
   ui_test_utils::NavigateToURL(browser(),
                                embedded_test_server()->GetURL(kSimplePage));
@@ skipping 355 matching lines @@
   ui_test_utils::UrlLoadObserver observer(
       GURL("about:blank"), content::NotificationService::AllSources());
 
   // Send Ctrl-Enter, should cause navigation to about:blank.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_RETURN, true, false, false, false));
 
   observer.Wait();
 }
 #endif