x11: Prefer using ui::GetXDisplay() over getting the Display from the X11 message-pump.

ui/aura/test/ui_controls_factory_aurax11.cc

Index: ui/aura/test/ui_controls_factory_aurax11.cc
diff --git a/ui/aura/test/ui_controls_factory_aurax11.cc b/ui/aura/test/ui_controls_factory_aurax11.cc
index 5dc8577aaa70c3946bcb55b893b7e74191d00b1e..558d4404d7943a5ed0041e194431857974e5d6ef 100644
--- a/ui/aura/test/ui_controls_factory_aurax11.cc
+++ b/ui/aura/test/ui_controls_factory_aurax11.cc
@@ -11,13 +11,13 @@
 #endif
 
 #include "base/logging.h"
-#include "base/message_loop/message_pump_x11.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/test/ui_controls_aura.h"
+#include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 
 namespace aura {
@@ -73,9 +73,7 @@ class EventWaiter : public base::MessageLoopForUI::Observer {
 
 // Returns atom that indidates that the XEvent is marker event.
 Atom MarkerEventAtom() {
-  return XInternAtom(base::MessagePumpX11::GetDefaultXDisplay(),
-                     "marker_event",
-                     False);
+  return XInternAtom(ui::GetXDisplay(), "marker_event", False);
 }
 
 // Returns true when the event is a marker event.
@@ -117,7 +115,7 @@ class UIControlsX11 : public UIControlsAura {
     if (alt)
       SetKeycodeAndSendThenMask(&xevent, XK_Alt_L, Mod1Mask);
     xevent.xkey.keycode =
-        XKeysymToKeycode(base::MessagePumpX11::GetDefaultXDisplay(),
+        XKeysymToKeycode(ui::GetXDisplay(),
                          ui::XKeysymForWindowsKeyCode(key, shift));
     root_window_->PostNativeEvent(&xevent);
 
@@ -227,8 +225,7 @@ class UIControlsX11 : public UIControlsAura {
                                  KeySym keysym,
                                  unsigned int mask) {
     xevent->xkey.keycode =
-        XKeysymToKeycode(base::MessagePumpX11::GetDefaultXDisplay(),
-                         keysym);
+        XKeysymToKeycode(ui::GetXDisplay(), keysym);
     root_window_->PostNativeEvent(xevent);
     xevent->xkey.state |= mask;
   }
@@ -238,8 +235,7 @@ class UIControlsX11 : public UIControlsAura {
                                    KeySym keysym) {
     xevent->xkey.state ^= mask;
     xevent->xkey.keycode =
-        XKeysymToKeycode(base::MessagePumpX11::GetDefaultXDisplay(),
-                         keysym);
+        XKeysymToKeycode(ui::GetXDisplay(), keysym);
     root_window_->PostNativeEvent(xevent);
   }