Re-lands 58186:

chrome/test/automated_ui_tests/automated_ui_tests.cc

Index: chrome/test/automated_ui_tests/automated_ui_tests.cc
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index 1aad5757175379dd3eac56edbfdf234facb573fe..759c84c7da376191fadfe6eeca9f15fd82542697 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -6,10 +6,10 @@
 #include <string>
 #include <vector>
 
+#include "app/keyboard_codes.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
-#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ -486,35 +486,35 @@ bool AutomatedUITest::Options() {
 }
 
 bool AutomatedUITest::PressDownArrow() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_DOWN, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_DOWN, 0);
 }
 
 bool AutomatedUITest::PressEnterKey() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_RETURN, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_RETURN, 0);
 }
 
 bool AutomatedUITest::PressEscapeKey() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_ESCAPE, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_ESCAPE, 0);
 }
 
 bool AutomatedUITest::PressPageDown() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_PRIOR, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_PRIOR, 0);
 }
 
 bool AutomatedUITest::PressPageUp() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_NEXT, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_NEXT, 0);
 }
 
 bool AutomatedUITest::PressSpaceBar() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_SPACE, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_SPACE, 0);
 }
 
 bool AutomatedUITest::PressTabKey() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_TAB, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_TAB, 0);
 }
 
 bool AutomatedUITest::PressUpArrow() {
-  return SimulateKeyPressInActiveWindow(base::VKEY_UP, 0);
+  return SimulateKeyPressInActiveWindow(app::VKEY_UP, 0);
 }
 
 bool AutomatedUITest::StarPage() {
@@ -604,7 +604,7 @@ bool AutomatedUITest::ForceCrash() {
   return true;
 }
 
-bool AutomatedUITest::SimulateKeyPressInActiveWindow(base::KeyboardCode key,
+bool AutomatedUITest::SimulateKeyPressInActiveWindow(app::KeyboardCode key,
                                                      int flags) {
   scoped_refptr<WindowProxy> window(automation()->GetActiveWindow());
   if (window.get() == NULL) {