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

chrome/test/automated_ui_tests/automated_ui_tests.h

Index: chrome/test/automated_ui_tests/automated_ui_tests.h
===================================================================
--- chrome/test/automated_ui_tests/automated_ui_tests.h	(revision 58389)
+++ chrome/test/automated_ui_tests/automated_ui_tests.h	(working copy)
@@ -103,7 +103,7 @@
 
 #include <string>
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
 #include "chrome/test/ui/ui_test.h"
 
@@ -295,7 +295,7 @@
   // Calls SimulateOSKeyPress on the active window. Simulates a key press at
   // the OS level. |key| is the key pressed  and |flags| specifies which
   // modifiers keys are also pressed (as defined in chrome/views/event.h).
-  bool SimulateKeyPressInActiveWindow(app::KeyboardCode key, int flags);
+  bool SimulateKeyPressInActiveWindow(base::KeyboardCode key, int flags);
 
   // Opens init file, reads it into the reader, and closes the file.
   // Returns false if there are any errors.