Distinguish between keystroke and character events.

ui/events/test/event_generator.cc

Index: ui/events/test/event_generator.cc
diff --git a/ui/events/test/event_generator.cc b/ui/events/test/event_generator.cc
index 6eff2d1ae838da59f782330fb51f1a62f217ee38..b4772e5b06a377c3a052e78c2e62ae071585e08b 100644
--- a/ui/events/test/event_generator.cc
+++ b/ui/events/test/event_generator.cc
@@ -33,8 +33,8 @@ void DummyCallback(EventType, const gfx::Vector2dF&) {
 
 class TestKeyEvent : public ui::KeyEvent {
  public:
-  TestKeyEvent(const base::NativeEvent& native_event, int flags, bool is_char)
-      : KeyEvent(native_event, is_char) {
+  TestKeyEvent(const base::NativeEvent& native_event, int flags)
+      : KeyEvent(native_event) {
     set_flags(flags);
   }
 };
@@ -502,7 +502,7 @@ void EventGenerator::DispatchKeyEvent(bool is_press,
   uint16 character = ui::GetCharacterFromKeyCode(key_code, flags);
   if (is_press && character) {
     MSG native_event = { NULL, WM_KEYDOWN, key_code, 0 };
-    TestKeyEvent keyev(native_event, flags, false);
+    TestKeyEvent keyev(native_event, flags);
     Dispatch(&keyev);
     // On Windows, WM_KEYDOWN event is followed by WM_CHAR with a character
     // if the key event cooresponds to a real character.
@@ -511,16 +511,16 @@ void EventGenerator::DispatchKeyEvent(bool is_press,
   }
   MSG native_event =
       { NULL, (is_press ? key_press : WM_KEYUP), key_code, 0 };
-  TestKeyEvent keyev(native_event, flags, key_press == WM_CHAR);
+  TestKeyEvent keyev(native_event, flags);
 #elif defined(USE_X11)
   ui::ScopedXI2Event xevent;
   xevent.InitKeyEvent(is_press ? ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED,
                       key_code,
                       flags);
-  ui::KeyEvent keyev(xevent, false);
+  ui::KeyEvent keyev(xevent);
 #else
   ui::EventType type = is_press ? ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED;
-  ui::KeyEvent keyev(type, key_code, flags, false);
+  ui::KeyEvent keyev(type, key_code, flags);
 #endif  // OS_WIN
   Dispatch(&keyev);
 }