Re-lands 58186:

chrome/test/automation/window_proxy.h

Index: chrome/test/automation/window_proxy.h
diff --git a/chrome/test/automation/window_proxy.h b/chrome/test/automation/window_proxy.h
index cb7b0221450b6299e5b5060398f95561125e8d9a..f0a9ac57288f0221f5aa06e9bff13a36980f81ce 100644
--- a/chrome/test/automation/window_proxy.h
+++ b/chrome/test/automation/window_proxy.h
@@ -12,7 +12,7 @@
 #include <windows.h>
 #endif
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "base/string16.h"
 #include "base/thread.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
@@ -54,7 +54,7 @@ class WindowProxy : public AutomationResourceProxy {
   // key pressed and |flags| specifies which modifiers keys are also pressed (as
   // defined in chrome/views/event.h).  Note that this actually sends the event
   // to the window that has focus.
-  bool SimulateOSKeyPress(base::KeyboardCode key, int flags);
+  bool SimulateOSKeyPress(app::KeyboardCode key, int flags);
 
   // Shows/hides the window and as a result makes it active/inactive.
   // Returns true if the call was successful.