Nukes MessageLoop::Dispatcher (2)

There is no point in this typedef now that MessagePumpDispatcher is
its own class.

BUG=none
TEST=none
R=darin@chromium.org
TBR=darin@chromium.org

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

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

4 files changed, 15 insertions, 9 deletions

diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index 59c6cdc..74eddaf 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -25,9 +25,8 @@
 #include "base/time/time.h"
 #include "base/tracking_info.h"
 
+// TODO(sky): these includes should not be necessary. Nuke them.
 #if defined(OS_WIN)
-// We need this to declare base::MessagePumpWin::Dispatcher, which we should
-// really just eliminate.
 #include "base/message_loop/message_pump_win.h"
 #elif defined(OS_IOS)
 #include "base/message_loop/message_pump_io_ios.h"
@@ -53,7 +52,6 @@
 namespace base {
 
 class HistogramBase;
-class MessagePumpDispatcher;
 class MessagePumpObserver;
 class RunLoop;
 class ThreadTaskRunnerHandle;
@@ -97,7 +95,6 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
  public:
 
 #if defined(USE_AURA)
-  typedef MessagePumpDispatcher Dispatcher;
   typedef MessagePumpObserver Observer;
 #elif defined(USE_GTK_MESSAGE_PUMP)
   typedef MessagePumpGdkObserver Observer;
diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc
index 64cf7c8..4a4949d 100644
--- a/base/message_loop/message_loop_unittest.cc
+++ b/base/message_loop/message_loop_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy_impl.h"
 #include "base/message_loop/message_loop_test.h"
+#include "base/message_loop/message_pump_dispatcher.h"
 #include "base/pending_task.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/run_loop.h"
@@ -445,7 +446,7 @@ void PostNTasksThenQuit(int posts_remaining) {
 
 #if defined(OS_WIN)
 
-class DispatcherImpl : public MessageLoopForUI::Dispatcher {
+class DispatcherImpl : public MessagePumpDispatcher {
  public:
   DispatcherImpl() : dispatch_count_(0) {}
 
diff --git a/base/run_loop.cc b/base/run_loop.cc
index 45723bb..fccd28e 100644
--- a/base/run_loop.cc
+++ b/base/run_loop.cc
@@ -6,6 +6,10 @@
 
 #include "base/bind.h"
 
+#if defined(USE_AURA)
+#include "base/message_loop/message_pump_dispatcher.h"
+#endif
+
 namespace base {
 
 RunLoop::RunLoop()
@@ -23,7 +27,7 @@ RunLoop::RunLoop()
 }
 
 #if defined(USE_AURA)
-RunLoop::RunLoop(MessageLoop::Dispatcher* dispatcher)
+RunLoop::RunLoop(MessagePumpDispatcher* dispatcher)
     : loop_(MessageLoop::current()),
       previous_run_loop_(NULL),
       dispatcher_(dispatcher),
diff --git a/base/run_loop.h b/base/run_loop.h
index 112bb79..5ad92c6 100644
--- a/base/run_loop.h
+++ b/base/run_loop.h
@@ -15,6 +15,10 @@ namespace base {
 class MessagePumpForUI;
 #endif
 
+#if defined(USE_AURA)
+class MessagePumpDispatcher;
+#endif
+
 #if defined(OS_IOS)
 class MessagePumpUIApplication;
 #endif
@@ -28,12 +32,12 @@ class BASE_EXPORT RunLoop {
  public:
   RunLoop();
 #if defined(USE_AURA)
-  explicit RunLoop(MessageLoop::Dispatcher* dispatcher);
+  explicit RunLoop(MessagePumpDispatcher* dispatcher);
 #endif
   ~RunLoop();
 
 #if defined(USE_AURA)
-  void set_dispatcher(MessageLoop::Dispatcher* dispatcher) {
+  void set_dispatcher(MessagePumpDispatcher* dispatcher) {
     dispatcher_ = dispatcher;
   }
 #endif
@@ -96,7 +100,7 @@ class BASE_EXPORT RunLoop {
   RunLoop* previous_run_loop_;
 
 #if defined(USE_AURA)
-  MessageLoop::Dispatcher* dispatcher_;
+  MessagePumpDispatcher* dispatcher_;
 #endif
 
   // Used to count how many nested Run() invocations are on the stack.