| Index: ash/accelerators/accelerator_controller_unittest.cc
|
| diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
|
| index c17dcf10aa3dedbe8f4172d076be33ae2ff6b949..ddb670c990df7c10a9b2be81e0b8498af5a49e20 100644
|
| --- a/ash/accelerators/accelerator_controller_unittest.cc
|
| +++ b/ash/accelerators/accelerator_controller_unittest.cc
|
| @@ -627,7 +627,8 @@ TEST_F(AcceleratorControllerTest, DontRepeatToggleFullscreen) {
|
| TEST_F(AcceleratorControllerTest, ProcessOnce) {
|
| // The IME event filter interferes with the basic key event propagation we
|
| // attempt to do here, so we disable it.
|
| - DisableIME();
|
| + const bool kSkipIME = true;
|
| +
|
| ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
|
| TestTarget target;
|
| GetController()->Register({accelerator_a}, &target);
|
| @@ -638,15 +639,18 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) {
|
| ui::ScopedXI2Event key_event;
|
| key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
|
| ui::KeyEvent key_event1(key_event);
|
| + key_event1.set_skip_ime(kSkipIME);
|
| ui::EventDispatchDetails details = sink->OnEventFromSource(&key_event1);
|
| EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
|
|
|
| - ui::KeyEvent key_event2('A', ui::VKEY_A, ui::EF_NONE);
|
| + ui::KeyEvent key_event2('A', ui::VKEY_A, 0);
|
| + key_event2.set_skip_ime(kSkipIME);
|
| details = sink->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);
|
| + key_event3.set_skip_ime(kSkipIME);
|
| details = sink->OnEventFromSource(&key_event3);
|
| EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
|
| EXPECT_EQ(1, target.accelerator_pressed_count());
|
|
|