| Index: ash/extended_desktop_unittest.cc
|
| diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
|
| index 600cdef9b335bb9e3b2dd0e2b129b9f3d8369e99..dbab0792c767f8af3c5638ada5a5b0ae229d6ad2 100644
|
| --- a/ash/extended_desktop_unittest.cc
|
| +++ b/ash/extended_desktop_unittest.cc
|
| @@ -788,15 +788,13 @@ TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
|
| // The lock window should get events on both root windows.
|
| aura::test::EventGenerator& event_generator(GetEventGenerator());
|
|
|
| - event_generator.set_current_dispatcher(
|
| - root_windows[0]->GetHost()->dispatcher());
|
| + event_generator.set_current_host(root_windows[0]->GetHost());
|
| event_generator.PressKey(ui::VKEY_A, 0);
|
| event_generator.ReleaseKey(ui::VKEY_A, 0);
|
| EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
|
| EXPECT_EQ("a", UTF16ToASCII(textfield->text()));
|
|
|
| - event_generator.set_current_dispatcher(
|
| - root_windows[1]->GetHost()->dispatcher());
|
| + event_generator.set_current_host(root_windows[1]->GetHost());
|
| event_generator.PressKey(ui::VKEY_B, 0);
|
| event_generator.ReleaseKey(ui::VKEY_B, 0);
|
| EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
|
| @@ -813,15 +811,13 @@ TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
|
| // on both root windows.
|
| UpdateDisplay("100x100,200x200");
|
| root_windows = Shell::GetAllRootWindows();
|
| - event_generator.set_current_dispatcher(
|
| - root_windows[0]->GetHost()->dispatcher());
|
| + event_generator.set_current_host(root_windows[0]->GetHost());
|
| event_generator.PressKey(ui::VKEY_D, 0);
|
| event_generator.ReleaseKey(ui::VKEY_D, 0);
|
| EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
|
| EXPECT_EQ("abcd", UTF16ToASCII(textfield->text()));
|
|
|
| - event_generator.set_current_dispatcher(
|
| - root_windows[1]->GetHost()->dispatcher());
|
| + event_generator.set_current_host(root_windows[1]->GetHost());
|
| event_generator.PressKey(ui::VKEY_E, 0);
|
| event_generator.ReleaseKey(ui::VKEY_E, 0);
|
| EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
|
|
|