Revert 245226 "Nukes MessageLoop::Dispatcher"

> Nukes MessageLoop::Dispatcher
> 
> There is no point in this typedef now that MessagePumpDispatcher is
> its own class.
> 
> BUG=none
> TEST=none
> R=ben@chromium.org, darin@chromium.org
> 
> Review URL: https://codereview.chromium.org/139593002

TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/138433008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245239 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 9 deletions

diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc
index 7d29e68..23bae22 100644
--- a/ash/accelerators/accelerator_dispatcher.cc
+++ b/ash/accelerators/accelerator_dispatcher.cc
@@ -67,7 +67,7 @@ bool IsPossibleAcceleratorNotForMenu(const ui::KeyEvent& key_event) {
 }  // namespace
 
 AcceleratorDispatcher::AcceleratorDispatcher(
-    base::MessagePumpDispatcher* nested_dispatcher,
+    base::MessageLoop::Dispatcher* nested_dispatcher,
     aura::Window* associated_window)
     : nested_dispatcher_(nested_dispatcher),
       associated_window_(associated_window) {
diff --git a/ash/accelerators/accelerator_dispatcher.h b/ash/accelerators/accelerator_dispatcher.h
index ecc85b0..c0dfb03 100644
--- a/ash/accelerators/accelerator_dispatcher.h
+++ b/ash/accelerators/accelerator_dispatcher.h
@@ -6,7 +6,7 @@
 #define ASH_ACCELERATORS_ACCELERATOR_DISPATCHER_H_
 
 #include "ash/ash_export.h"
-#include "base/message_loop/message_pump_dispatcher.h"
+#include "base/message_loop/message_loop.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 
@@ -19,21 +19,21 @@ namespace ash {
 // TODO(pkotwicz): Port AcceleratorDispatcher to mac.
 // TODO(pkotwicz): Add support for a |nested_dispatcher| which sends
 //  events to a system IME.
-class ASH_EXPORT AcceleratorDispatcher : public base::MessagePumpDispatcher,
+class ASH_EXPORT AcceleratorDispatcher : public base::MessageLoop::Dispatcher,
                                          public aura::WindowObserver {
  public:
-  AcceleratorDispatcher(base::MessagePumpDispatcher* nested_dispatcher,
+  AcceleratorDispatcher(base::MessageLoop::Dispatcher* nested_dispatcher,
                         aura::Window* associated_window);
   virtual ~AcceleratorDispatcher();
 
-  // MessagePumpDispatcher overrides:
+  // MessageLoop::Dispatcher overrides:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
   // aura::WindowObserver overrides:
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
  private:
-  base::MessagePumpDispatcher* nested_dispatcher_;
+  base::MessageLoop::Dispatcher* nested_dispatcher_;
 
   // Window associated with |nested_dispatcher_| which is used to determine
   // whether the |nested_dispatcher_| is allowed to receive events.
diff --git a/ash/accelerators/nested_dispatcher_controller.cc b/ash/accelerators/nested_dispatcher_controller.cc
index d30d66d..82e477c 100644
--- a/ash/accelerators/nested_dispatcher_controller.cc
+++ b/ash/accelerators/nested_dispatcher_controller.cc
@@ -17,7 +17,7 @@ NestedDispatcherController::~NestedDispatcherController() {
 }
 
 void NestedDispatcherController::RunWithDispatcher(
-    base::MessagePumpDispatcher* nested_dispatcher,
+    base::MessageLoop::Dispatcher* nested_dispatcher,
     aura::Window* associated_window,
     bool nestable_tasks_allowed) {
   base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
diff --git a/ash/accelerators/nested_dispatcher_controller.h b/ash/accelerators/nested_dispatcher_controller.h
index b0c2b9a..c6f9320 100644
--- a/ash/accelerators/nested_dispatcher_controller.h
+++ b/ash/accelerators/nested_dispatcher_controller.h
@@ -22,7 +22,7 @@ class ASH_EXPORT NestedDispatcherController
   NestedDispatcherController();
   virtual ~NestedDispatcherController();
 
-  virtual void RunWithDispatcher(base::MessagePumpDispatcher* dispatcher,
+  virtual void RunWithDispatcher(base::MessageLoop::Dispatcher* dispatcher,
                                  aura::Window* associated_window,
                                  bool nestable_tasks_allowed) OVERRIDE;
 
diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc
index f3ae2b7..445c29c 100644
--- a/ash/accelerators/nested_dispatcher_controller_unittest.cc
+++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc
@@ -28,7 +28,7 @@ namespace test {
 
 namespace {
 
-class MockDispatcher : public base::MessagePumpDispatcher {
+class MockDispatcher : public base::MessageLoop::Dispatcher {
  public:
   MockDispatcher() : num_key_events_dispatched_(0) {
   }