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 706914a39b75388d75e85baf106bdef4436030d1..89c9b8f3b5e15b84a5193da414a32e21bace5388 100644
--- a/base/message_pump_wayland.h
+++ b/base/message_pump_wayland.h
@@ -10,10 +10,6 @@
 #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 {
@@ -41,23 +37,7 @@ class MessagePumpDispatcher {
   virtual ~MessagePumpDispatcher() {}
 };
 
-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;
+typedef MessagePumpGlib MessagePumpForUI;
 
 }  // namespace base