Move app/key* to ui/base/keycodes/*

chrome/test/interactive_ui/keyboard_access_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 "app/keyboard_codes.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/event.h"
 
 // This functionality currently works on Windows and on Linux when
 // toolkit_views is defined (i.e. for Chrome OS). It's not needed
 // on the Mac, and it's not yet implemented on Linux.
 #if defined(TOOLKIT_VIEWS)
 
 namespace {
 
 class KeyboardAccessTest : public UITest {
@@ skipping 32 matching lines @@
   // The initial tab index should be 0.
   int tab_index = -1;
   ASSERT_TRUE(browser->GetActiveTabIndex(&tab_index));
   ASSERT_EQ(0, tab_index);
 
   // Get the focused view ID, then press a key to activate the
   // page menu, then wait until the focused view changes.
   int original_view_id = -1;
   ASSERT_TRUE(window->GetFocusedViewID(&original_view_id));
 
-  app::KeyboardCode menu_key =
-      alternate_key_sequence ? app::VKEY_MENU : app::VKEY_F10;
+  ui::KeyboardCode menu_key =
+      alternate_key_sequence ? ui::VKEY_MENU : ui::VKEY_F10;
 #if defined(OS_CHROMEOS)
   // Chrome OS has different function key accelerators, so we always use the
   // menu key there.
-  menu_key = app::VKEY_MENU;
+  menu_key = ui::VKEY_MENU;
 #endif
   ASSERT_TRUE(window->SimulateOSKeyPress(menu_key, modifiers));
 
   if (modifiers) {
     // Verify Chrome does not move the view focus. We should not move the view
     // focus when typing a menu key with modifier keys, such as shift keys or
     // control keys.
     int new_view_id = -1;
     ASSERT_TRUE(window->GetFocusedViewID(&new_view_id));
     ASSERT_EQ(original_view_id, new_view_id);
     return;
   }
 
   int new_view_id = -1;
   ASSERT_TRUE(window->WaitForFocusedViewIDToChange(
       original_view_id, &new_view_id));
 
   ASSERT_TRUE(browser->StartTrackingPopupMenus());
 
   if (alternate_key_sequence)
-    ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_DOWN, 0));
+    ASSERT_TRUE(window->SimulateOSKeyPress(ui::VKEY_DOWN, 0));
   else
-    ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_RETURN, 0));
+    ASSERT_TRUE(window->SimulateOSKeyPress(ui::VKEY_RETURN, 0));
 
   // Wait until the popup menu actually opens.
   ASSERT_TRUE(browser->WaitForPopupMenuToOpen());
 
   // Press DOWN to select the first item, then RETURN to select it.
-  ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_DOWN, 0));
-  ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_RETURN, 0));
+  ASSERT_TRUE(window->SimulateOSKeyPress(ui::VKEY_DOWN, 0));
+  ASSERT_TRUE(window->SimulateOSKeyPress(ui::VKEY_RETURN, 0));
 
   // Wait for the new tab to appear.
   ASSERT_TRUE(browser->WaitForTabCountToBecome(2));
 
   // Make sure that the new tab index is 1.
   ASSERT_TRUE(browser->GetActiveTabIndex(&tab_index));
   ASSERT_EQ(1, tab_index);
 }
 
 // Disabled, http://crbug.com/62310.
@@ skipping 37 matching lines @@
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(tab_count, 2);
 
   int active_tab = 0;
   ASSERT_TRUE(browser->GetActiveTabIndex(&active_tab));
   ASSERT_EQ(active_tab, 1);
 
   scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window);
   ASSERT_TRUE(window->SimulateOSKeyPress(
-      app::VKEY_TAB, views::Event::EF_CONTROL_DOWN));
+      ui::VKEY_TAB, views::Event::EF_CONTROL_DOWN));
   ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms()));
 
 #if !defined(OS_MACOSX)  // see BrowserWindowCocoa::GetCommandId
   ASSERT_TRUE(browser->ActivateTab(1));
   ASSERT_TRUE(window->SimulateOSKeyPress(
-      app::VKEY_F4, views::Event::EF_CONTROL_DOWN));
+      ui::VKEY_F4, views::Event::EF_CONTROL_DOWN));
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
 #endif
 }
 
 }  // namespace
 
 #endif  // defined(TOOLKIT_VIEWS)