Refactor the glib message-pump, and use it as the base for a gtk message pump and an X message pump.

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index dac1bd2b7e4acda9905f4370f7890474133454a1..41ea923c2b9c21f6f1fc011c485e7dc2db28af3e 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -368,9 +368,15 @@
               'sources!': [
                 'atomicops_internals_x86_gcc.cc',
                 'message_pump_glib.cc',
-                'message_pump_glib_x.cc',
+                'message_pump_gtk.cc',
+                'message_pump_x.cc',
               ],
           }],
+          [ 'touchui==0', {
+            'sources!' : [ 'message_pump_x.cc', ],
+          }, {
+            'sources!' : [ 'message_pump_gtk.cc', ],
+          }],
           [ 'OS != "linux"', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
@@ -571,9 +577,10 @@
         'md5.h',
         'message_pump_glib.cc',
         'message_pump_glib.h',
-        'message_pump_glib_x.cc',
-        'message_pump_glib_x.h',
-        'message_pump_glib_x_dispatch.h',
+        'message_pump_gtk.cc',
+        'message_pump_gtk.h',
+        'message_pump_x.cc',
+        'message_pump_x.h',
         'message_pump_libevent.cc',
         'message_pump_libevent.h',
         'message_pump_mac.h',