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

chromeos/display/output_util.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/display/output_util.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
 
@@ skipping 21 matching lines @@
             uint32 product_code_hash,
             uint8 output_index) {
   return ((static_cast<int64>(manufacturer_id) << 40) |
           (static_cast<int64>(product_code_hash) << 8) | output_index);
 }
 
 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;
 }
 
 // Get the EDID data from the |output| and stores to |prop|. |nitem| will store
 // the number of characters |prop| will have. It doesn't take the ownership of
 // |prop|, so caller must release it by XFree().
 // Returns true if EDID property is successfully obtained. Otherwise returns
 // false and does not touch |prop| and |nitems|.
 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;
   int num_properties = 0;
   Atom* properties = XRRListOutputProperties(display, output, &num_properties);
   for (int i = 0; i < num_properties; ++i) {
     if (properties[i] == edid_property) {
       has_edid_property = true;
       break;
     }
@@ skipping 326 matching lines @@
     mode_info.hTotal = 1;
     mode_info.vTotal = 1;
     mode_info.dotClock = refresh_rate;
   }
   return mode_info;
 }
 
 }  // namespace test
 
 }  // namespace chromeos