Revert 223621 "x11: Prefer using ui::GetXDisplay() over getting ..."

trunk/src/ui/aura/test/ui_controls_factory_aurax11.cc

Index: trunk/src/ui/aura/test/ui_controls_factory_aurax11.cc
===================================================================
--- trunk/src/ui/aura/test/ui_controls_factory_aurax11.cc	(revision 223638)
+++ trunk/src/ui/aura/test/ui_controls_factory_aurax11.cc	(working copy)
@@ -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,7 +73,9 @@
 
 // Returns atom that indidates that the XEvent is marker event.
 Atom MarkerEventAtom() {
-  return XInternAtom(ui::GetXDisplay(), "marker_event", False);
+  return XInternAtom(base::MessagePumpX11::GetDefaultXDisplay(),
+                     "marker_event",
+                     False);
 }
 
 // Returns true when the event is a marker event.
@@ -115,7 +117,7 @@
     if (alt)
       SetKeycodeAndSendThenMask(&xevent, XK_Alt_L, Mod1Mask);
     xevent.xkey.keycode =
-        XKeysymToKeycode(ui::GetXDisplay(),
+        XKeysymToKeycode(base::MessagePumpX11::GetDefaultXDisplay(),
                          ui::XKeysymForWindowsKeyCode(key, shift));
     root_window_->PostNativeEvent(&xevent);
 
@@ -225,7 +227,8 @@
                                  KeySym keysym,
                                  unsigned int mask) {
     xevent->xkey.keycode =
-        XKeysymToKeycode(ui::GetXDisplay(), keysym);
+        XKeysymToKeycode(base::MessagePumpX11::GetDefaultXDisplay(),
+                         keysym);
     root_window_->PostNativeEvent(xevent);
     xevent->xkey.state |= mask;
   }
@@ -235,7 +238,8 @@
                                    KeySym keysym) {
     xevent->xkey.state ^= mask;
     xevent->xkey.keycode =
-        XKeysymToKeycode(ui::GetXDisplay(), keysym);
+        XKeysymToKeycode(base::MessagePumpX11::GetDefaultXDisplay(),
+                         keysym);
     root_window_->PostNativeEvent(xevent);
   }