Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.

Also moves the associated classes/enums from base:: to app::.

TEST=try bots compile
BUG=NONE

Review URL: http://codereview.chromium.org/3165064

TBR=bryeung@chromium.org

TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003

TBR=bryeung@chromium.org
Review URL: http://codereview.chromium.org/3337006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 13 deletions

diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc
index d002a3e..2fdd3e8 100644
--- a/chrome/test/interactive_ui/keyboard_access_uitest.cc
+++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc
@@ -2,7 +2,7 @@
 // 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 "base/keyboard_codes.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
@@ -59,12 +59,12 @@ void KeyboardAccessTest::TestMenuKeyboardAccess(bool alternate_key_sequence) {
   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;
+  base::KeyboardCode menu_key =
+      alternate_key_sequence ? base::VKEY_MENU : base::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 = base::VKEY_MENU;
 #endif
   ASSERT_TRUE(window->SimulateOSKeyPress(menu_key, 0));
 
@@ -75,16 +75,16 @@ void KeyboardAccessTest::TestMenuKeyboardAccess(bool alternate_key_sequence) {
   ASSERT_TRUE(browser->StartTrackingPopupMenus());
 
   if (alternate_key_sequence)
-    ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_DOWN, 0));
+    ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_DOWN, 0));
   else
-    ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_RETURN, 0));
+    ASSERT_TRUE(window->SimulateOSKeyPress(base::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(base::VKEY_DOWN, 0));
+  ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_RETURN, 0));
 
   // Wait for the new tab to appear.
   ASSERT_TRUE(browser->WaitForTabCountToBecome(2, action_timeout_ms()));
@@ -125,13 +125,13 @@ TEST_F(KeyboardAccessTest, FAILS_ReserveKeyboardAccelerators) {
   scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window);
   ASSERT_TRUE(window->SimulateOSKeyPress(
-      app::VKEY_TAB, views::Event::EF_CONTROL_DOWN));
+      base::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));
+      base::VKEY_F4, views::Event::EF_CONTROL_DOWN));
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms()));
 #endif
 }
diff --git a/chrome/test/interactive_ui/npapi_interactive_test.cc b/chrome/test/interactive_ui/npapi_interactive_test.cc
index 7a867d2..7965151 100644
--- a/chrome/test/interactive_ui/npapi_interactive_test.cc
+++ b/chrome/test/interactive_ui/npapi_interactive_test.cc
@@ -31,8 +31,8 @@
 // NPAPI interactive UI tests.
 //
 
-#include "app/keyboard_codes.h"
 #include "base/file_path.h"
+#include "base/keyboard_codes.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
@@ -95,7 +95,7 @@ TEST_F(NPAPIVisiblePluginTester, GetURLRequest404Response) {
   automation()->WaitForAppModalDialog();
   scoped_refptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get());
-  ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_ESCAPE, 0));
+  ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_ESCAPE, 0));
 
   WaitForFinish("geturl_404_response", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, action_max_timeout_ms());
@@ -114,7 +114,7 @@ TEST_F(NPAPIVisiblePluginTester, DISABLED_SelfDeletePluginInvokeAlert) {
   ASSERT_TRUE(automation()->WaitForAppModalDialog());
   scoped_refptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get());
-  ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_ESCAPE, 0));
+  ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_ESCAPE, 0));
 
   WaitForFinish("self_delete_plugin_invoke_alert", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,