Revise ui::DomKey to unify character and non-character codes.

chrome/browser/chromeos/events/event_rewriter.h

Index: chrome/browser/chromeos/events/event_rewriter.h
diff --git a/chrome/browser/chromeos/events/event_rewriter.h b/chrome/browser/chromeos/events/event_rewriter.h
index 1c3f01a31c863a59fb3e1c79b764e2b5eae642cf..82352795d0a8e2097e409c9a53f990d1ad7d9d67 100644
--- a/chrome/browser/chromeos/events/event_rewriter.h
+++ b/chrome/browser/chromeos/events/event_rewriter.h
@@ -14,6 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event.h"
 #include "ui/events/event_rewriter.h"
+#include "ui/events/keycodes/dom/dom_key.h"
 
 class PrefService;
 
@@ -23,7 +24,6 @@ class StickyKeysController;
 
 namespace ui {
 enum class DomCode;
-enum class DomKey;
 };
 
 namespace chromeos {
@@ -54,8 +54,7 @@ class EventRewriter : public ui::EventRewriter {
   struct MutableKeyState {
     int flags;
     ui::DomCode code;
-    ui::DomKey key;
-    base::char16 character;
+    ui::DomKey::Base key;
     ui::KeyboardCode key_code;
   };