gtk: Allow building both the X11 and Gtk message-pumps for gtk.

chromeos/display/output_util.cc

Index: chromeos/display/output_util.cc
diff --git a/chromeos/display/output_util.cc b/chromeos/display/output_util.cc
index 4800a2d30843ac3015f4d25fe6efa4c3d97ee604..45f9b6ac05d0e0f4163e39dec6a824dbfcb508cf 100644
--- a/chromeos/display/output_util.cc
+++ b/chromeos/display/output_util.cc
@@ -39,7 +39,7 @@ bool IsRandRAvailable() {
   int randr_version_major = 0;
   int randr_version_minor = 0;
   static bool is_randr_available = XRRQueryVersion(
-      base::MessagePumpAuraX11::GetDefaultXDisplay(),
+      base::MessagePumpX11::GetDefaultXDisplay(),
       &randr_version_major, &randr_version_minor);
   return is_randr_available;
 }
@@ -53,10 +53,10 @@ bool GetEDIDProperty(XID output, unsigned long* nitems, unsigned char** prop) {
   if (!IsRandRAvailable())
     return false;
 
-  Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay();
+  Display* display = base::MessagePumpX11::GetDefaultXDisplay();
 
   static Atom edid_property = XInternAtom(
-      base::MessagePumpAuraX11::GetDefaultXDisplay(),
+      base::MessagePumpX11::GetDefaultXDisplay(),
       RR_PROPERTY_RANDR_EDID, false);
 
   bool has_edid_property = false;