Distinguish between keystroke and character events.

ui/views/window/dialog_delegate_unittest.cc

Index: ui/views/window/dialog_delegate_unittest.cc
diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc
index fedb6983eb210828e33b816b422c79261243656c..b3551043be34cbd7d5048e266b329a513261bb9a 100644
--- a/ui/views/window/dialog_delegate_unittest.cc
+++ b/ui/views/window/dialog_delegate_unittest.cc
@@ -51,7 +51,7 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
   Button* last_pressed_button() const { return last_pressed_button_; }
 
   void PressEnterAndCheckStates(Button* button) {
-    ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false);
+    ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE);
     GetFocusManager()->OnKeyEvent(key_event);
     const DialogClientView* client_view = GetDialogClientView();
     EXPECT_EQ(canceled_, client_view->cancel_button()->is_default());
@@ -158,10 +158,12 @@ TEST_F(DialogTest, AcceptAndCancel) {
   LabelButton* cancel_button = client_view->cancel_button();
 
   // Check that return/escape accelerators accept/cancel dialogs.
-  const ui::KeyEvent return_key(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false);
+  const ui::KeyEvent return_key(
+      ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE);
   dialog()->GetFocusManager()->OnKeyEvent(return_key);
   dialog()->CheckAndResetStates(false, true, NULL);
-  const ui::KeyEvent escape_key(ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, 0, false);
+  const ui::KeyEvent escape_key(
+      ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, ui::EF_NONE);
   dialog()->GetFocusManager()->OnKeyEvent(escape_key);
   dialog()->CheckAndResetStates(true, false, NULL);