Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/browser/views/browser_keyboard_accessibility_test_win.cc

Index: chrome/browser/views/browser_keyboard_accessibility_test_win.cc
===================================================================
--- chrome/browser/views/browser_keyboard_accessibility_test_win.cc	(revision 58389)
+++ chrome/browser/views/browser_keyboard_accessibility_test_win.cc	(working copy)
@@ -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/browser/automation/ui_controls.h"
 #include "chrome/browser/views/chrome_views_delegate.h"
 #include "chrome/browser/views/frame/browser_view.h"
@@ -119,7 +119,7 @@
     // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
     LOG(ERROR) << "Sending TAB key event...";
     ui_controls::SendKeyPressNotifyWhenDone(current_view_native_window(),
-                                            app::VKEY_TAB,
+                                            base::VKEY_TAB,
                                             true, false, false, false,
                                             new MessageLoop::QuitTask());
     set_waiting(true);
@@ -153,7 +153,7 @@
                        DISABLED_TabInToolbar) {
   gfx::NativeWindow native_window = browser()->window()->GetNativeHandle();
   ui_controls::SendKeyPressNotifyWhenDone(native_window,
-                                          app::VKEY_T,
+                                          base::VKEY_T,
                                           false, true, true, false,
                                           new MessageLoop::QuitTask());
   set_waiting(true);
@@ -197,7 +197,7 @@
   do {
     // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
     LOG(ERROR) << "Sending TAB key event.";
-    ui_controls::SendKeyPressNotifyWhenDone(hwnd, app::VKEY_TAB,
+    ui_controls::SendKeyPressNotifyWhenDone(hwnd, base::VKEY_TAB,
         false, !forward_tab, false, false, new MessageLoop::QuitTask());
     set_waiting(true);
     ui_test_utils::RunMessageLoop();