wm: Change the DispatcherClient interface.

ui/wm/core/nested_accelerator_controller_unittest.cc

 // Copyright 2014 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/wm/core/nested_accelerator_controller.h"
 
 #include "base/bind.h"
 #include "base/event_types.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 162 matching lines @@
 
   scoped_ptr<aura::Window> associated_window(
       CreateNormalWindow(2, root_window(), NULL));
   EXPECT_TRUE(aura::test::WindowIsAbove(associated_window.get(),
                                         mock_lock_container.get()));
 
   DispatchKeyReleaseA(root_window());
   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());
 }
 
 // Test that the nested dispatcher handles accelerators.
 TEST_F(NestedAcceleratorTest, AcceleratorsHandled) {
   // TODO(oshima|sadrul): remove when Win implements PES.
   if (!ui::PlatformEventSource::GetInstance())
     return;
   MockDispatcher inner_dispatcher;
   ui::Accelerator accelerator(ui::VKEY_A, ui::EF_NONE);
   accelerator.set_type(ui::ET_KEY_RELEASED);
   TestTarget target;
   delegate()->Register(accelerator, &target);
 
   DispatchKeyReleaseA(root_window());
   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());
 }
 
 }  //  namespace test
 }  //  namespace wm