| Index: ui/wm/core/nested_accelerator_controller_unittest.cc
|
| diff --git a/ui/wm/core/nested_accelerator_controller_unittest.cc b/ui/wm/core/nested_accelerator_controller_unittest.cc
|
| index 996b2a4a7a5c1380adc94e67f4d4f6f85c6bdd6e..fae9f8e41af5c644c1f24902dac2730ead4bf3df 100644
|
| --- a/ui/wm/core/nested_accelerator_controller_unittest.cc
|
| +++ b/ui/wm/core/nested_accelerator_controller_unittest.cc
|
| @@ -180,7 +180,9 @@ TEST_F(NestedAcceleratorTest, AssociatedWindowAboveLockScreen) {
|
| scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =
|
| ui::PlatformEventSource::GetInstance()->OverrideDispatcher(
|
| &inner_dispatcher);
|
| - aura::client::GetDispatcherClient(root_window())->RunWithDispatcher(NULL);
|
| + aura::client::DispatcherRunLoop run_loop(
|
| + aura::client::GetDispatcherClient(root_window()), NULL);
|
| + run_loop.Run();
|
| EXPECT_EQ(1, inner_dispatcher.num_key_events_dispatched());
|
| }
|
|
|
| @@ -199,7 +201,9 @@ TEST_F(NestedAcceleratorTest, AcceleratorsHandled) {
|
| scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =
|
| ui::PlatformEventSource::GetInstance()->OverrideDispatcher(
|
| &inner_dispatcher);
|
| - aura::client::GetDispatcherClient(root_window())->RunWithDispatcher(NULL);
|
| + aura::client::DispatcherRunLoop run_loop(
|
| + aura::client::GetDispatcherClient(root_window()), NULL);
|
| + run_loop.Run();
|
| EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
|
| EXPECT_EQ(1, target.accelerator_pressed_count());
|
| }
|
|
|