wm: Change the DispatcherClient interface.

ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ skipping 171 matching lines @@
     // Owned by |widget|.
     aura::Window* window = new aura::Window(&delegate);
     window->Show();
     widget.GetNativeWindow()->parent()->AddChild(window);
 
     widget.Show();
   }
 }
 
 void QuitNestedLoopAndCloseWidget(scoped_ptr<Widget> widget,
-                                  aura::client::DispatcherClient* client) {
-  client->QuitNestedMessageLoop();
+                                  base::Closure* quit_runloop) {
+  quit_runloop->Run();
 }
 
 // Verifies that a widget can be destroyed when running a nested message-loop.
 TEST_F(DesktopNativeWidgetAuraTest, WidgetCanBeDestroyedFromNestedLoop) {
   scoped_ptr<Widget> widget(new Widget);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.native_widget = new DesktopNativeWidgetAura(widget.get());
   widget->Init(params);
   widget->Show();
 
   aura::Window* window = widget->GetNativeView();
   aura::Window* root = window->GetRootWindow();
   aura::client::DispatcherClient* client =
       aura::client::GetDispatcherClient(root);
 
   // Post a task that terminates the nested loop and destroyes the widget. This
   // task will be executed from the nested loop initiated with the call to
   // |RunWithDispatcher()| below.
+  aura::client::DispatcherRunLoop run_loop(client, NULL);
+  base::Closure quit_runloop = run_loop.QuitClosure();
   message_loop()->PostTask(FROM_HERE,
-      base::Bind(&QuitNestedLoopAndCloseWidget, base::Passed(&widget), client));
-  client->RunWithDispatcher(NULL);
+                           base::Bind(&QuitNestedLoopAndCloseWidget,
+                                      base::Passed(&widget),
+                                      base::Unretained(&quit_runloop)));
+  run_loop.Run();
 }
 
 }  // namespace views