Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

chrome/test/webdriver/keymap.cc

Index: chrome/test/webdriver/keymap.cc
===================================================================
--- chrome/test/webdriver/keymap.cc	(revision 58386)
+++ chrome/test/webdriver/keymap.cc	(working copy)
@@ -14,132 +14,132 @@
   // 0xE000-0xF8FF.
 
   // Special WebDriver NULL key; clears all modifiers.
-  keys_[L'\uE000'] = base::VKEY_UNKNOWN;
+  keys_[L'\uE000'] = app::VKEY_UNKNOWN;
 
-  keys_[L'\uE001'] = base::VKEY_UNKNOWN;  // TODO(jmikhail): CANCEL
-  keys_[L'\uE002'] = base::VKEY_HELP;
-  keys_[L'\uE003'] = base::VKEY_BACK;     // BACKSPACE
-  keys_[L'\uE004'] = base::VKEY_TAB;
-  keys_[L'\uE005'] = base::VKEY_CLEAR;
-  keys_[L'\uE006'] = base::VKEY_RETURN;
-  keys_[L'\uE007'] = base::VKEY_UNKNOWN;  // TODO(jmikhail): ENTER
-  keys_[L'\uE008'] = base::VKEY_SHIFT;
-  keys_[L'\uE009'] = base::VKEY_CONTROL;
-  keys_[L'\uE00A'] = base::VKEY_MENU;     // ALT
-  keys_[L'\uE00B'] = base::VKEY_PAUSE;
-  keys_[L'\uE00C'] = base::VKEY_ESCAPE;
-  keys_[L'\uE00D'] = base::VKEY_SPACE;
-  keys_[L'\uE00E'] = base::VKEY_PRIOR;    // PAGEUP
-  keys_[L'\uE00F'] = base::VKEY_NEXT;     // PAGEDOWN
-  keys_[L'\uE010'] = base::VKEY_END;
-  keys_[L'\uE011'] = base::VKEY_HOME;
-  keys_[L'\uE012'] = base::VKEY_LEFT;
-  keys_[L'\uE013'] = base::VKEY_UP;
-  keys_[L'\uE014'] = base::VKEY_RIGHT;
-  keys_[L'\uE015'] = base::VKEY_DOWN;
-  keys_[L'\uE016'] = base::VKEY_INSERT;
-  keys_[L'\uE017'] = base::VKEY_DELETE;
+  keys_[L'\uE001'] = app::VKEY_UNKNOWN;  // TODO(jmikhail): CANCEL
+  keys_[L'\uE002'] = app::VKEY_HELP;
+  keys_[L'\uE003'] = app::VKEY_BACK;     // BACKSPACE
+  keys_[L'\uE004'] = app::VKEY_TAB;
+  keys_[L'\uE005'] = app::VKEY_CLEAR;
+  keys_[L'\uE006'] = app::VKEY_RETURN;
+  keys_[L'\uE007'] = app::VKEY_UNKNOWN;  // TODO(jmikhail): ENTER
+  keys_[L'\uE008'] = app::VKEY_SHIFT;
+  keys_[L'\uE009'] = app::VKEY_CONTROL;
+  keys_[L'\uE00A'] = app::VKEY_MENU;     // ALT
+  keys_[L'\uE00B'] = app::VKEY_PAUSE;
+  keys_[L'\uE00C'] = app::VKEY_ESCAPE;
+  keys_[L'\uE00D'] = app::VKEY_SPACE;
+  keys_[L'\uE00E'] = app::VKEY_PRIOR;    // PAGEUP
+  keys_[L'\uE00F'] = app::VKEY_NEXT;     // PAGEDOWN
+  keys_[L'\uE010'] = app::VKEY_END;
+  keys_[L'\uE011'] = app::VKEY_HOME;
+  keys_[L'\uE012'] = app::VKEY_LEFT;
+  keys_[L'\uE013'] = app::VKEY_UP;
+  keys_[L'\uE014'] = app::VKEY_RIGHT;
+  keys_[L'\uE015'] = app::VKEY_DOWN;
+  keys_[L'\uE016'] = app::VKEY_INSERT;
+  keys_[L'\uE017'] = app::VKEY_DELETE;
 
-  keys_[L'\uE01A'] = base::VKEY_NUMPAD0;
-  keys_[L'\uE01B'] = base::VKEY_NUMPAD1;
-  keys_[L'\uE01C'] = base::VKEY_NUMPAD2;
-  keys_[L'\uE01D'] = base::VKEY_NUMPAD3;
-  keys_[L'\uE01E'] = base::VKEY_NUMPAD4;
-  keys_[L'\uE01F'] = base::VKEY_NUMPAD5;
-  keys_[L'\uE020'] = base::VKEY_NUMPAD6;
-  keys_[L'\uE021'] = base::VKEY_NUMPAD7;
-  keys_[L'\uE022'] = base::VKEY_NUMPAD8;
-  keys_[L'\uE023'] = base::VKEY_NUMPAD9;
-  keys_[L'\uE024'] = base::VKEY_MULTIPLY;
-  keys_[L'\uE025'] = base::VKEY_ADD;
-  keys_[L'\uE026'] = base::VKEY_SEPARATOR;
-  keys_[L'\uE027'] = base::VKEY_SUBTRACT;
-  keys_[L'\uE028'] = base::VKEY_DECIMAL;
-  keys_[L'\uE029'] = base::VKEY_DIVIDE;
+  keys_[L'\uE01A'] = app::VKEY_NUMPAD0;
+  keys_[L'\uE01B'] = app::VKEY_NUMPAD1;
+  keys_[L'\uE01C'] = app::VKEY_NUMPAD2;
+  keys_[L'\uE01D'] = app::VKEY_NUMPAD3;
+  keys_[L'\uE01E'] = app::VKEY_NUMPAD4;
+  keys_[L'\uE01F'] = app::VKEY_NUMPAD5;
+  keys_[L'\uE020'] = app::VKEY_NUMPAD6;
+  keys_[L'\uE021'] = app::VKEY_NUMPAD7;
+  keys_[L'\uE022'] = app::VKEY_NUMPAD8;
+  keys_[L'\uE023'] = app::VKEY_NUMPAD9;
+  keys_[L'\uE024'] = app::VKEY_MULTIPLY;
+  keys_[L'\uE025'] = app::VKEY_ADD;
+  keys_[L'\uE026'] = app::VKEY_SEPARATOR;
+  keys_[L'\uE027'] = app::VKEY_SUBTRACT;
+  keys_[L'\uE028'] = app::VKEY_DECIMAL;
+  keys_[L'\uE029'] = app::VKEY_DIVIDE;
 
-  keys_[L'\uE031'] = base::VKEY_F1;
-  keys_[L'\uE032'] = base::VKEY_F2;
-  keys_[L'\uE033'] = base::VKEY_F3;
-  keys_[L'\uE034'] = base::VKEY_F4;
-  keys_[L'\uE035'] = base::VKEY_F5;
-  keys_[L'\uE036'] = base::VKEY_F6;
-  keys_[L'\uE037'] = base::VKEY_F7;
-  keys_[L'\uE038'] = base::VKEY_F8;
-  keys_[L'\uE039'] = base::VKEY_F9;
-  keys_[L'\uE03A'] = base::VKEY_F10;
-  keys_[L'\uE03B'] = base::VKEY_F11;
-  keys_[L'\uE03C'] = base::VKEY_F12;
+  keys_[L'\uE031'] = app::VKEY_F1;
+  keys_[L'\uE032'] = app::VKEY_F2;
+  keys_[L'\uE033'] = app::VKEY_F3;
+  keys_[L'\uE034'] = app::VKEY_F4;
+  keys_[L'\uE035'] = app::VKEY_F5;
+  keys_[L'\uE036'] = app::VKEY_F6;
+  keys_[L'\uE037'] = app::VKEY_F7;
+  keys_[L'\uE038'] = app::VKEY_F8;
+  keys_[L'\uE039'] = app::VKEY_F9;
+  keys_[L'\uE03A'] = app::VKEY_F10;
+  keys_[L'\uE03B'] = app::VKEY_F11;
+  keys_[L'\uE03C'] = app::VKEY_F12;
 
   // Common aliases.
-  keys_[L'\t'] = base::VKEY_TAB;
-  keys_[L'\n'] = base::VKEY_RETURN;
-  keys_[L'\r'] = base::VKEY_RETURN;
-  keys_[L'\b'] = base::VKEY_BACK;
+  keys_[L'\t'] = app::VKEY_TAB;
+  keys_[L'\n'] = app::VKEY_RETURN;
+  keys_[L'\r'] = app::VKEY_RETURN;
+  keys_[L'\b'] = app::VKEY_BACK;
 
-  keys_[L' '] = base::VKEY_SPACE;
+  keys_[L' '] = app::VKEY_SPACE;
 
   // Alpha keys match their ASCII values
   for (int i = 0; i < 26; ++i) {
     keys_[static_cast<wchar_t>(L'a' + i)] = \
-      static_cast<base::KeyboardCode>(base::VKEY_A + i);
+      static_cast<app::KeyboardCode>(app::VKEY_A + i);
     shifted_keys_[static_cast<wchar_t>(L'A' + i)] = \
-      static_cast<base::KeyboardCode>(base::VKEY_A + i);
+      static_cast<app::KeyboardCode>(app::VKEY_A + i);
   }
 
   // Numeric keys match their ASCII values
   for (int i = 0; i < 10; ++i) {
     keys_[static_cast<wchar_t>(L'0' + i)] = \
-      static_cast<base::KeyboardCode>(base::VKEY_0 + i);
+      static_cast<app::KeyboardCode>(app::VKEY_0 + i);
   }
 
   // The following all assumes the standard US keyboard.
   // TODO(jmikhail): Lookup correct keycode based on the current system keyboard
   // layout.  Right now it's fixed assuming standard ANSI
-  keys_[L'=']  = shifted_keys_[L'+'] = base::VKEY_OEM_PLUS;
-  keys_[L'-']  = shifted_keys_[L'_'] = base::VKEY_OEM_MINUS;
-  keys_[L';']  = shifted_keys_[L':'] = base::VKEY_OEM_1;
-  keys_[L'/']  = shifted_keys_[L'?'] = base::VKEY_OEM_2;
-  keys_[L'`']  = shifted_keys_[L'~'] = base::VKEY_OEM_3;
-  keys_[L'[']  = shifted_keys_[L'{'] = base::VKEY_OEM_4;
-  keys_[L'\\'] = shifted_keys_[L'|'] = base::VKEY_OEM_5;
-  keys_[L']']  = shifted_keys_[L'}'] = base::VKEY_OEM_6;
-  keys_[L'\''] = shifted_keys_[L'"'] = base::VKEY_OEM_7;
-  keys_[L',']  = shifted_keys_[L'<'] = base::VKEY_OEM_COMMA;
-  keys_[L'.']  = shifted_keys_[L'>'] = base::VKEY_OEM_PERIOD;
-  shifted_keys_[L'!'] = base::VKEY_1;
-  shifted_keys_[L'@'] = base::VKEY_2;
-  shifted_keys_[L'#'] = base::VKEY_3;
-  shifted_keys_[L'$'] = base::VKEY_4;
-  shifted_keys_[L'%'] = base::VKEY_5;
-  shifted_keys_[L'^'] = base::VKEY_6;
-  shifted_keys_[L'&'] = base::VKEY_7;
-  shifted_keys_[L'*'] = base::VKEY_8;
-  shifted_keys_[L'('] = base::VKEY_9;
-  shifted_keys_[L')'] = base::VKEY_0;
+  keys_[L'=']  = shifted_keys_[L'+'] = app::VKEY_OEM_PLUS;
+  keys_[L'-']  = shifted_keys_[L'_'] = app::VKEY_OEM_MINUS;
+  keys_[L';']  = shifted_keys_[L':'] = app::VKEY_OEM_1;
+  keys_[L'/']  = shifted_keys_[L'?'] = app::VKEY_OEM_2;
+  keys_[L'`']  = shifted_keys_[L'~'] = app::VKEY_OEM_3;
+  keys_[L'[']  = shifted_keys_[L'{'] = app::VKEY_OEM_4;
+  keys_[L'\\'] = shifted_keys_[L'|'] = app::VKEY_OEM_5;
+  keys_[L']']  = shifted_keys_[L'}'] = app::VKEY_OEM_6;
+  keys_[L'\''] = shifted_keys_[L'"'] = app::VKEY_OEM_7;
+  keys_[L',']  = shifted_keys_[L'<'] = app::VKEY_OEM_COMMA;
+  keys_[L'.']  = shifted_keys_[L'>'] = app::VKEY_OEM_PERIOD;
+  shifted_keys_[L'!'] = app::VKEY_1;
+  shifted_keys_[L'@'] = app::VKEY_2;
+  shifted_keys_[L'#'] = app::VKEY_3;
+  shifted_keys_[L'$'] = app::VKEY_4;
+  shifted_keys_[L'%'] = app::VKEY_5;
+  shifted_keys_[L'^'] = app::VKEY_6;
+  shifted_keys_[L'&'] = app::VKEY_7;
+  shifted_keys_[L'*'] = app::VKEY_8;
+  shifted_keys_[L'('] = app::VKEY_9;
+  shifted_keys_[L')'] = app::VKEY_0;
 }
 
-base::KeyboardCode KeyMap::Get(const wchar_t& key) const {
-  std::map<wchar_t, base::KeyboardCode>::const_iterator it;
+app::KeyboardCode KeyMap::Get(const wchar_t& key) const {
+  std::map<wchar_t, app::KeyboardCode>::const_iterator it;
   it = keys_.find(key);
   if (it == keys_.end()) {
     it = shifted_keys_.find(key);
     if (it == shifted_keys_.end()) {
-      return base::VKEY_UNKNOWN;
+      return app::VKEY_UNKNOWN;
     }
   }
   return it->second;
 }
 
 bool KeyMap::Press(const scoped_refptr<WindowProxy>& window,
-                   const base::KeyboardCode key_code,
+                   const app::KeyboardCode key_code,
                    const wchar_t& key) {
-  if (key_code == base::VKEY_SHIFT) {
+  if (key_code == app::VKEY_SHIFT) {
     shift_ = !shift_;
-  } else if (key_code == base::VKEY_CONTROL) {
+  } else if (key_code == app::VKEY_CONTROL) {
     control_ = !control_;
-  } else if (key_code == base::VKEY_MENU) {  // ALT
+  } else if (key_code == app::VKEY_MENU) {  // ALT
     alt_ = !alt_;
-  } else if (key_code == base::VKEY_COMMAND) {
+  } else if (key_code == app::VKEY_COMMAND) {
     command_ = !command_;
   }