Revert "Refactor MessagePumpX to dispatch events inside of the source Dispatch function."

base/message_pump_wayland.h

Index: base/message_pump_wayland.h
diff --git a/base/message_pump_wayland.h b/base/message_pump_wayland.h
index 89c9b8f3b5e15b84a5193da414a32e21bace5388..706914a39b75388d75e85baf106bdef4436030d1 100644
--- a/base/message_pump_wayland.h
+++ b/base/message_pump_wayland.h
@@ -10,6 +10,10 @@
 #include "base/message_pump_glib.h"
 #include "base/message_pump_observer.h"
 
+typedef struct _GMainContext GMainContext;
+typedef struct _GPollFD GPollFD;
+typedef struct _GSource GSource;
+
 namespace base {
 
 namespace wayland {
@@ -37,7 +41,23 @@ class MessagePumpDispatcher {
   virtual ~MessagePumpDispatcher() {}
 };
 
-typedef MessagePumpGlib MessagePumpForUI;
+class BASE_EXPORT MessagePumpWayland : public MessagePumpGlib {
+
+ public:
+  MessagePumpWayland();
+  virtual ~MessagePumpWayland();
+
+  // Overridden from MessagePumpGlib
+  virtual bool RunOnce(GMainContext* context, bool block) OVERRIDE;
+ private:
+
+  // This is a GLib structure that we can add event sources to.
+  GMainContext* context_;
+
+  DISALLOW_COPY_AND_ASSIGN(MessagePumpWayland);
+};
+
+typedef MessagePumpWayland MessagePumpForUI;
 
 }  // namespace base