Revert of Remove special key rewrite code for x11 (https://codereview.chromium.org/1000713003)

chrome/browser/chromeos/events/event_rewriter_unittest.cc

Index: chrome/browser/chromeos/events/event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index 13c0843da96941f3d443028045143907c2f68657..ea0753385f7044cfddacbafe36d712ac49245728 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -115,10 +115,14 @@ void CheckX11KeyTestCase(const std::string& expected,
   ui::KeyEvent& rewritten_key_event =
       new_event ? *static_cast<ui::KeyEvent*>(new_event.get()) : xkey_event;
   EXPECT_EQ(expected, GetKeyEventAsString(rewritten_key_event));
-  if (xevent->type == GenericEvent)
-    EXPECT_EQ(nullptr, rewritten_key_event.native_event());
-  else
-    EXPECT_NE(nullptr, rewritten_key_event.native_event());
+  if ((rewritten_key_event.key_code() != ui::VKEY_UNKNOWN) &&
+      (rewritten_key_event.native_event()->xkey.keycode != 0)) {
+    // Build a new ui::KeyEvent from the rewritten native component,
+    // and check that it also matches the rewritten event.
+    EXPECT_TRUE(rewritten_key_event.native_event());
+    ui::KeyEvent from_native_event(rewritten_key_event.native_event());
+    EXPECT_EQ(expected, GetKeyEventAsString(from_native_event));
+  }
 }
 #endif