| Index: ash/accelerators/nested_dispatcher_controller_unittest.cc
|
| diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc
|
| index e5aef887fb50c9d65fa0f8c0c26a40b1cbe1dd80..399cbcbd4ec6bc8dc9029e69148b0fc8c3702e26 100644
|
| --- a/ash/accelerators/nested_dispatcher_controller_unittest.cc
|
| +++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc
|
| @@ -123,7 +123,9 @@ TEST_F(NestedDispatcherTest, AssociatedWindowAboveLockScreen) {
|
| scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =
|
| ui::PlatformEventSource::GetInstance()->OverrideDispatcher(
|
| &inner_dispatcher);
|
| - aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(NULL);
|
| + base::Closure quit_runloop;
|
| + aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
|
| + NULL, &quit_runloop);
|
| EXPECT_EQ(1, inner_dispatcher.num_key_events_dispatched());
|
| }
|
|
|
| @@ -142,7 +144,9 @@ TEST_F(NestedDispatcherTest, AcceleratorsHandled) {
|
| scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =
|
| ui::PlatformEventSource::GetInstance()->OverrideDispatcher(
|
| &inner_dispatcher);
|
| - aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(NULL);
|
| + base::Closure quit_runloop;
|
| + aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
|
| + NULL, &quit_runloop);
|
| EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
|
| EXPECT_EQ(1, target.accelerator_pressed_count());
|
| }
|
|
|