Re-lands 58186:

chrome/browser/browser_focus_uitest.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 288 matching lines @@
     gfx::NativeWindow window = browser()->window()->GetNativeHandle();
     browser()->SelectTabContentsAt(0, true);
     // Try the above, but with ctrl+tab. Since tab normally changes focus,
     // this has regressed in the past. Loop through several times to be sure.
     for (int j = 0; j < 15; j++) {
       ViewID vid = kFocusPage[i][j % 5] ? VIEW_ID_TAB_CONTAINER_FOCUS_VIEW :
                                           VIEW_ID_LOCATION_BAR;
       ASSERT_TRUE(IsViewFocused(vid));
 
       ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-          window, base::VKEY_TAB, true, false, false, false));
+          window, app::VKEY_TAB, true, false, false, false));
     }
 
     // As above, but with ctrl+shift+tab.
     browser()->SelectTabContentsAt(4, true);
     for (int j = 14; j >= 0; --j) {
       ViewID vid = kFocusPage[i][j % 5] ? VIEW_ID_TAB_CONTAINER_FOCUS_VIEW :
                                           VIEW_ID_LOCATION_BAR;
       ASSERT_TRUE(IsViewFocused(vid));
 
       ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-          window, base::VKEY_TAB, true, true, false, false));
+          window, app::VKEY_TAB, true, true, false, false));
     }
   }
 }
 
 // Tabs remember focus with find-in-page box.
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) {
   BringBrowserWindowToFront();
   ASSERT_TRUE(test_server()->Start());
 
   // First we navigate to our test page.
@@ skipping 142 matching lines @@
       SCOPED_TRACE(StringPrintf("inner loop %" PRIuS, j));
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
           browser()->GetSelectedTabContents()->render_view_host(),
           L"",
           L"window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
 
-      ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB,
+      ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB,
                                             false, false, false, false));
 
       if (j < arraysize(kExpElementIDs) - 1) {
         ASSERT_NO_FATAL_FAILURE(
             ui_test_utils::WaitForFocusChange(
                 browser()->GetSelectedTabContents()->render_view_host()));
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_NO_FATAL_FAILURE(
             ui_test_utils::WaitForFocusInBrowser(browser()));
       }
     }
 
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
     ui_test_utils::RunAllPendingInMessageLoop();
   }
 
   // Now let's try reverse focus traversal.
   for (int i = 0; i < 3; ++i) {
     SCOPED_TRACE(StringPrintf("outer loop: %d", i));
     // Location bar should be focused.
     ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));
 
     // Now let's press shift-tab to move the focus in reverse.
     for (size_t j = 0; j < 7; ++j) {
       SCOPED_TRACE(StringPrintf("inner loop: %" PRIuS, j));
-      ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB,
+      ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB,
                                             false, true, false, false));
 
       if (j < arraysize(kExpElementIDs) - 1) {
         ASSERT_NO_FATAL_FAILURE(
             ui_test_utils::WaitForFocusChange(
                 browser()->GetSelectedTabContents()->render_view_host()));
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_NO_FATAL_FAILURE(
             ui_test_utils::WaitForFocusInBrowser(browser()));
@@ skipping 54 matching lines @@
   for (int i = 0; i < 2; ++i) {
     // Location bar should be focused.
     ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));
 
     // Now let's press tab to move the focus.
     for (size_t j = 0; j < 7; ++j) {
       // Let's make sure the focus is on the expected element in the page.
       std::string actual = interstitial_page->GetFocusedElement();
       ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
 
-      ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB,
+      ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB,
                                             false, false, false, false));
 
       if (j < arraysize(kExpElementIDs) - 1) {
         ASSERT_NO_FATAL_FAILURE(interstitial_page->WaitForFocusChange());
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_NO_FATAL_FAILURE(
             ui_test_utils::WaitForFocusInBrowser(browser()));
       }
     }
 
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
     ui_test_utils::RunAllPendingInMessageLoop();
   }
 
   // Now let's try reverse focus traversal.
   for (int i = 0; i < 2; ++i) {
     // Location bar should be focused.
     ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));
 
     // Now let's press shift-tab to move the focus in reverse.
     for (size_t j = 0; j < 7; ++j) {
-      ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB,
+      ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB,
                                             false, true, false, false));
 
       if (j < arraysize(kExpElementIDs) - 1) {
         ASSERT_NO_FATAL_FAILURE(interstitial_page->WaitForFocusChange());
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_NO_FATAL_FAILURE(
             ui_test_utils::WaitForFocusInBrowser(browser()));
       }
 
@@ skipping 52 matching lines @@
 
   // Open some page (any page that doesn't steal focus).
   GURL url = test_server()->GetURL(kTypicalPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   gfx::NativeWindow window = browser()->window()->GetNativeHandle();
 
 #if defined(OS_MACOSX)
   // Press Cmd+F, which will make the Find box open and request focus.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_F, false, false, false, true));
+      window, app::VKEY_F, false, false, false, true));
 #else
   // Press Ctrl+F, which will make the Find box open and request focus.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_F, true, false, false, false));
+      window, app::VKEY_F, true, false, false, false));
 #endif
 
   // Ideally, we wouldn't sleep here and instead would intercept the
   // RenderViewHostDelegate::HandleKeyboardEvent() callback.  To do that, we
   // could create a RenderViewHostDelegate wrapper and hook-it up by either:
   // - creating a factory used to create the delegate
   // - making the test a private and overwriting the delegate member directly.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, new MessageLoop::QuitTask(), kActionDelayMs);
   ui_test_utils::RunMessageLoop();
 
   ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   browser()->FocusLocationBar();
   ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));
 
   // Now press Ctrl+F again and focus should move to the Find box.
 #if defined(OS_MACOSX)
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_F, false, false, false, true));
+      window, app::VKEY_F, false, false, false, true));
 #else
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_F, true, false, false, false));
+      window, app::VKEY_F, true, false, false, false));
 #endif
   ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   // Set focus to the page.
   ClickOnView(VIEW_ID_TAB_CONTAINER);
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   // Now press Ctrl+F again and focus should move to the Find box.
 #if defined(OS_MACOSX)
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_F, false, false, false, true));
+      window, app::VKEY_F, false, false, false, true));
 #else
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_F, true, false, false, false));
+      window, app::VKEY_F, true, false, false, false));
 #endif
 
   // See remark above on why we wait.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, new MessageLoop::QuitTask(), kActionDelayMs);
   ui_test_utils::RunMessageLoop();
   ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 }
 
 // Makes sure the focus is in the right location when opening the different
@@ skipping 66 matching lines @@
   ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
   browser()->Reload(CURRENT_TAB);
   ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
 
   // Focus should now be on the tab contents.
   browser()->ShowDownloadsTab();
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 }
 
 }  // namespace