Re-lands 58186:

chrome/browser/automation/ui_controls.h

Index: chrome/browser/automation/ui_controls.h
diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h
index 2b26dfeba2206c66cc0e37a0474e415a3a2bd428..3664567f88b3ec894caf379bb22b813ae5522e5c 100644
--- a/chrome/browser/automation/ui_controls.h
+++ b/chrome/browser/automation/ui_controls.h
@@ -12,7 +12,7 @@
 #include <wtypes.h>
 #endif
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/point.h"
 
@@ -46,13 +46,13 @@ namespace ui_controls {
 // If you're writing a test chances are you want the variant in ui_test_utils.
 // See it for details.
 bool SendKeyPress(gfx::NativeWindow window,
-                  base::KeyboardCode key,
+                  app::KeyboardCode key,
                   bool control,
                   bool shift,
                   bool alt,
                   bool command);
 bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
-                                base::KeyboardCode key,
+                                app::KeyboardCode key,
                                 bool control,
                                 bool shift,
                                 bool alt,