| Index: ui/views/controls/menu/menu_controller_unittest.cc
|
| diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc
|
| index 28424c997acf45eb6043002b0eeb7599a13af02e..f88c7a4a4acc774d0b2ad23b34612f4160722e48 100644
|
| --- a/ui/views/controls/menu/menu_controller_unittest.cc
|
| +++ b/ui/views/controls/menu/menu_controller_unittest.cc
|
| @@ -75,21 +75,19 @@ class TestDispatcherClient : public aura::client::DispatcherClient {
|
|
|
| // aura::client::DispatcherClient:
|
| virtual void RunWithDispatcher(
|
| - base::MessagePumpDispatcher* dispatcher) OVERRIDE {
|
| + base::MessagePumpDispatcher* dispatcher,
|
| + base::Closure* quit_closure) OVERRIDE {
|
| base::AutoReset<base::MessagePumpDispatcher*> reset_dispatcher(&dispatcher_,
|
| dispatcher);
|
| base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
|
| base::MessageLoop::ScopedNestableTaskAllower allow(loop);
|
| base::RunLoop run_loop;
|
| - quit_callback_ = run_loop.QuitClosure();
|
| + *quit_closure = run_loop.QuitClosure();
|
| run_loop.Run();
|
| }
|
|
|
| - virtual void QuitNestedMessageLoop() OVERRIDE { quit_callback_.Run(); }
|
| -
|
| private:
|
| base::MessagePumpDispatcher* dispatcher_;
|
| - base::Closure quit_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestDispatcherClient);
|
| };
|
|
|