Re-lands 58186:

chrome/test/webdriver/keymap.h

Index: chrome/test/webdriver/keymap.h
diff --git a/chrome/test/webdriver/keymap.h b/chrome/test/webdriver/keymap.h
index 688ffa7e4b9f95cdac06e21c0c0b824f0addd627..e4b15945c6930ccea625ccf4312412dbd61ceda8 100644
--- a/chrome/test/webdriver/keymap.h
+++ b/chrome/test/webdriver/keymap.h
@@ -7,7 +7,7 @@
 
 #include <map>
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "chrome/test/automation/window_proxy.h"
 
 namespace webdriver {
@@ -16,10 +16,10 @@ namespace webdriver {
 class KeyMap {
  public:
   KeyMap();
-  base::KeyboardCode Get(const wchar_t& key) const;
+  app::KeyboardCode Get(const wchar_t& key) const;
 
   bool Press(const scoped_refptr<WindowProxy>& window,
-             const base::KeyboardCode key_code,
+             const app::KeyboardCode key_code,
              const wchar_t& key);
 
   // Sets the Shift, Alt, Cntl, and Cmd keys to not pressed
@@ -30,8 +30,8 @@ class KeyMap {
   bool alt_;
   bool control_;
   bool command_;
-  std::map<wchar_t, base::KeyboardCode> keys_;
-  std::map<wchar_t, base::KeyboardCode> shifted_keys_;
+  std::map<wchar_t, app::KeyboardCode> keys_;
+  std::map<wchar_t, app::KeyboardCode> shifted_keys_;
   DISALLOW_COPY_AND_ASSIGN(KeyMap);
 };
 }  // namespace webdriver