Revert of Removing X11 native_event uses for key events. (patchset #7 id:180001 of https://codereview.chromium.org/479873002/)

Reason for revert:
Broke Android Tests (dbg)

C  427.575s Main  [FAIL] org.chromium.content.browser.input.ImeTest#testKeyCodesWhileComposingText:
C  427.575s Main  junit.framework.AssertionFailedError
C  427.575s Main  	at org.chromium.content.browser.input.ImeTest.assertUpdateStateCall(ImeTest.java:694)
C  427.575s Main  	at org.chromium.content.browser.input.ImeTest.testKeyCodesWhileComposingText(ImeTest.java:410)
C  427.575s Main  	at java.lang.reflect.Method.invokeNative(Native Method)
C  427.575s Main  	at android.test.InstrumentationTestCase.runMethod(InstrumentationTestCase.java:214)
C  427.575s Main  	at android.test.InstrumentationTestCase.runTest(InstrumentationTestCase.java:199)
C  427.575s Main  	at android.test.ActivityInstrumentationTestCase2.runTest(ActivityInstrumentationTestCase2.java:192)
C  427.575s Main  	at org.chromium.content_shell_apk.ContentShellTestBase.runTest(ContentShellTestBase.java:227)
C  427.575s Main  	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:191)
C  427.575s Main  	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:176)
C  427.575s Main  	at android.test.InstrumentationTestRunner.onStart(InstrumentationTestRunner.java:554)
C  427.575s Main  	at android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:1701)

Original issue's description:
> Removing uses of X11 native key events.
>
> BUG=380349
>
> Committed: https://chromium.googlesource.com/chromium/src/+/bbb7ea7c66f18298079eea4a6b24834986f4a822
>
> Committed: https://chromium.googlesource.com/chromium/src/+/13d90b146a400156427243d05159cadd8d72c0b9

TBR=sadrul@chromium.org,sky@chromium.org,erg@chromium.org,jamesr@chromium.org,boliu@chromium.org,kpschoedel@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=380349

Review URL: https://codereview.chromium.org/548303003

Cr-Commit-Position: refs/heads/master@{#293732}

2 files changed, 13 insertions, 9 deletions

diff --git a/mojo/services/native_viewport/platform_viewport_x11.cc b/mojo/services/native_viewport/platform_viewport_x11.cc
index d4914c7..dbf7fb8 100644
--- a/mojo/services/native_viewport/platform_viewport_x11.cc
+++ b/mojo/services/native_viewport/platform_viewport_x11.cc
@@ -104,9 +104,9 @@ class PlatformViewportX11 : public PlatformViewport,
 
       char_event.SetExtendedKeyEventData(scoped_ptr<ui::ExtendedKeyEventData>(
           new MojoExtendedKeyEventData(
-              key_press_event->GetLocatedWindowsKeyboardCode(),
-              key_press_event->GetText(),
-              key_press_event->GetUnmodifiedText())));
+              ui::WindowsKeycodeFromNative(key_press_event->native_event()),
+              ui::TextFromNative(key_press_event->native_event()),
+              ui::UnmodifiedTextFromNative(key_press_event->native_event()))));
       char_event.set_platform_keycode(key_press_event->platform_keycode());
 
       delegate_->OnEvent(&char_event);
diff --git a/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc b/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
index 340e200..4520aa4 100644
--- a/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
+++ b/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
@@ -119,12 +119,18 @@ EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) {
   } else if (input.IsKeyEvent()) {
     const ui::KeyEvent* key_event = static_cast<const ui::KeyEvent*>(&input);
     KeyDataPtr key_data(KeyData::New());
-    key_data->key_code = key_event->GetConflatedWindowsKeyCode();
+    key_data->key_code = key_event->key_code();
     key_data->native_key_code = key_event->platform_keycode();
     key_data->is_char = key_event->is_char();
     key_data->character = key_event->GetCharacter();
 
-    if (key_event->extended_key_event_data()) {
+    if (key_event->HasNativeEvent()) {
+      key_data->windows_key_code = static_cast<mojo::KeyboardCode>(
+          ui::WindowsKeycodeFromNative(key_event->native_event()));
+      key_data->text = ui::TextFromNative(key_event->native_event());
+      key_data->unmodified_text =
+          ui::UnmodifiedTextFromNative(key_event->native_event());
+    } else if (key_event->extended_key_event_data()) {
       const MojoExtendedKeyEventData* data =
           static_cast<const MojoExtendedKeyEventData*>(
               key_event->extended_key_event_data());
@@ -133,10 +139,8 @@ EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) {
       key_data->text = data->text();
       key_data->unmodified_text = data->unmodified_text();
     } else {
-      key_data->windows_key_code = static_cast<mojo::KeyboardCode>(
-          key_event->GetLocatedWindowsKeyboardCode());
-      key_data->text = key_event->GetText();
-      key_data->unmodified_text = key_event->GetUnmodifiedText();
+      NOTREACHED() << "Synthesized event which never contained a native event "
+          "passed to mojo::TypeConverter.";
     }
 
     event->key_data = key_data.Pass();