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

chrome/browser/chromeos/events/event_rewriter_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
@@ skipping 97 matching lines @@
   // Verify that the X11-based key event is as expected.
   EXPECT_EQ(GetExpectedResultAsString(
                      test.input.key_code, test.input.flags, test.type),
             GetKeyEventAsString(xkey_event));
   // Rewrite the event and check the result.
   scoped_ptr<ui::Event> new_event;
   rewriter->RewriteEvent(xkey_event, &new_event);
   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
 
 // Tests a single stateless key rewrite operation.
 // |i| is a an identifying number to locate failing tests in the tables.
 void CheckKeyTestCase(chromeos::EventRewriter* rewriter,
                       const KeyTestCase& test) {
   std::string expected =
       GetExpectedResultAsString(
                test.expected.key_code, test.expected.flags, test.type);
@@ skipping 2329 matching lines @@
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
   EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
 
   // Turn off AltGr and Mod3.
   sticky_keys_controller_->SetModifiersEnabled(false, false);
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
 }
 
 }  // namespace chromeos