Generate non-located windowsKeyCode for the WebInputEvents.

content/browser/renderer_host/input/web_input_event_builders_android.cc

Index: content/browser/renderer_host/input/web_input_event_builders_android.cc
diff --git a/content/browser/renderer_host/input/web_input_event_builders_android.cc b/content/browser/renderer_host/input/web_input_event_builders_android.cc
index 37dd16af7280d7c349738c9640ae8c52404f078d..7c6d8b4d22784f76cce4b9cc60c066482d56f020 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_android.cc
+++ b/content/browser/renderer_host/input/web_input_event_builders_android.cc
@@ -7,7 +7,8 @@
 #include "base/logging.h"
 #include "content/browser/renderer_host/input/motion_event_android.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
-#include "content/browser/renderer_host/input/web_input_event_util_posix.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 
@@ -30,13 +31,13 @@ WebKeyboardEvent WebKeyboardEventBuilder::Build(WebInputEvent::Type type,
   DCHECK(WebInputEvent::isKeyboardEventType(type));
   WebKeyboardEvent result;
 
+  ui::DomCode dom_code = ui::KeycodeConverter::NativeKeycodeToDomCode(keycode);
   result.type = type;
   result.modifiers = modifiers;
   result.timeStampSeconds = time_sec;
-  ui::KeyboardCode windows_key_code =
-      ui::KeyboardCodeFromAndroidKeyCode(keycode);
-  UpdateWindowsKeyCodeAndKeyIdentifier(&result, windows_key_code);
-  result.modifiers |= GetLocationModifiersFromWindowsKeyCode(windows_key_code);
+  result.windowsKeyCode = ui::LocatedToNonLocatedKeyboardCode(
+      ui::DomCodeToUsLayoutKeyboardCode(dom_code));
+  result.modifiers |= DomCodeToWebInputEventModifiers(dom_code);
   result.nativeKeyCode = keycode;
   result.unmodifiedText[0] = unicode_character;
   if (result.windowsKeyCode == ui::VKEY_RETURN) {
@@ -47,6 +48,7 @@ WebKeyboardEvent WebKeyboardEventBuilder::Build(WebInputEvent::Type type,
   }
   result.text[0] = result.unmodifiedText[0];
   result.isSystemKey = is_system_key;
+  result.setKeyIdentifierFromWindowsKeyCode();
 
   return result;
 }