Refactor MessagePumpX to dispatch events inside of the source Dispatch function.
Also clean up MessagePumpGlib.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8872055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114168 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: bae6675d851184f2be0ac117c1a847289c1c7bd9
diff --git a/base/message_loop.cc b/base/message_loop.cc
index ca85d6a..c7efe32 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -147,22 +147,13 @@
#elif defined(OS_MACOSX)
#define MESSAGE_PUMP_UI base::MessagePumpMac::Create()
#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
-#elif defined(OS_ANDROID)
-#define MESSAGE_PUMP_UI new base::MessagePumpForUI()
-#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
-#elif defined(USE_WAYLAND)
-#define MESSAGE_PUMP_UI new base::MessagePumpWayland()
-#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
-#elif defined(USE_AURA)
-#define MESSAGE_PUMP_UI new base::MessagePumpX()
-#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
#elif defined(OS_NACL)
// Currently NaCl doesn't have a UI or an IO MessageLoop.
// TODO(abarth): Figure out if we need these.
#define MESSAGE_PUMP_UI NULL
#define MESSAGE_PUMP_IO NULL
#elif defined(OS_POSIX) // POSIX but not MACOSX.
-#define MESSAGE_PUMP_UI new base::MessagePumpGtk()
+#define MESSAGE_PUMP_UI new base::MessagePumpForUI()
#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
#else
#error Not implemented