Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h

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 747e5fa77a47be4cfe0753d50c2fcd4ee72e9181..b67218198d7ee1aedbc9455970434b6111c67d44 100644
--- a/ui/aura/test/ui_controls_factory_aurax11.cc
+++ b/ui/aura/test/ui_controls_factory_aurax11.cc
@@ -73,7 +73,7 @@ class EventWaiter : public base::MessageLoopForUI::Observer {
 
 // Returns atom that indidates that the XEvent is marker event.
 Atom MarkerEventAtom() {
-  return XInternAtom(ui::GetXDisplay(), "marker_event", False);
+  return XInternAtom(gfx::GetXDisplay(), "marker_event", False);
 }
 
 // Returns true when the event is a marker event.
@@ -115,7 +115,7 @@ class UIControlsX11 : public UIControlsAura {
     if (alt)
       SetKeycodeAndSendThenMask(&xevent, XK_Alt_L, Mod1Mask);
     xevent.xkey.keycode =
-        XKeysymToKeycode(ui::GetXDisplay(),
+        XKeysymToKeycode(gfx::GetXDisplay(),
                          ui::XKeysymForWindowsKeyCode(key, shift));
     root_window_->PostNativeEvent(&xevent);
 
@@ -225,7 +225,7 @@ class UIControlsX11 : public UIControlsAura {
                                  KeySym keysym,
                                  unsigned int mask) {
     xevent->xkey.keycode =
-        XKeysymToKeycode(ui::GetXDisplay(), keysym);
+        XKeysymToKeycode(gfx::GetXDisplay(), keysym);
     root_window_->PostNativeEvent(xevent);
     xevent->xkey.state |= mask;
   }
@@ -235,7 +235,7 @@ class UIControlsX11 : public UIControlsAura {
                                    KeySym keysym) {
     xevent->xkey.state ^= mask;
     xevent->xkey.keycode =
-        XKeysymToKeycode(ui::GetXDisplay(), keysym);
+        XKeysymToKeycode(gfx::GetXDisplay(), keysym);
     root_window_->PostNativeEvent(xevent);
   }