Index: ash/accelerators/accelerator_controller_unittest.cc |
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc |
index 4fecc24d5b4c18d70b09ef9d15994207e3ee0b43..c5fc1cf14af95e389aa425e5fcdb6219d2505b1c 100644 |
--- a/ash/accelerators/accelerator_controller_unittest.cc |
+++ b/ash/accelerators/accelerator_controller_unittest.cc |
@@ -623,37 +623,37 @@ TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) { |
Shell::GetPrimaryRootWindow()->GetHost()->event_processor(); |
#if defined(OS_WIN) |
MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 }; |
- ui::KeyEvent key_event1(msg1, false); |
+ ui::KeyEvent key_event1(msg1); |
key_event1.SetTranslated(true); |
ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); |
EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); |
MSG msg2 = { NULL, WM_CHAR, L'A', 0 }; |
- ui::KeyEvent key_event2(msg2, true); |
+ ui::KeyEvent key_event2(msg2); |
key_event2.SetTranslated(true); |
details = dispatcher->OnEventFromSource(&key_event2); |
EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); |
MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 }; |
- ui::KeyEvent key_event3(msg3, false); |
+ ui::KeyEvent key_event3(msg3); |
key_event3.SetTranslated(true); |
details = dispatcher->OnEventFromSource(&key_event3); |
EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); |
#elif defined(USE_X11) |
ui::ScopedXI2Event key_event; |
key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0); |
- ui::KeyEvent key_event1(key_event, false); |
+ ui::KeyEvent key_event1(key_event); |
key_event1.SetTranslated(true); |
ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); |
EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); |
- ui::KeyEvent key_event2(key_event, true); |
+ ui::KeyEvent key_event2('A', ui::VKEY_A, ui::EF_NONE); |
key_event2.SetTranslated(true); |
details = dispatcher->OnEventFromSource(&key_event2); |
EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); |
key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0); |
- ui::KeyEvent key_event3(key_event, false); |
+ ui::KeyEvent key_event3(key_event); |
key_event3.SetTranslated(true); |
details = dispatcher->OnEventFromSource(&key_event3); |
EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); |