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

ui/compositor/test/test_compositor_host_x11.cc

Index: ui/compositor/test/test_compositor_host_x11.cc
diff --git a/ui/compositor/test/test_compositor_host_x11.cc b/ui/compositor/test/test_compositor_host_x11.cc
index b883357daa8177873225b8cae151cec7bde59727..5e09f805c34aa41e08fdd2cfc43f60da1e4def39 100644
--- a/ui/compositor/test/test_compositor_host_x11.cc
+++ b/ui/compositor/test/test_compositor_host_x11.cc
@@ -13,9 +13,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
@@ -55,7 +55,7 @@ TestCompositorHostX11::~TestCompositorHostX11() {
 }
 
 void TestCompositorHostX11::Show() {
-  Display* display = GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   XSetWindowAttributes swa;
   swa.event_mask = StructureNotifyMask | ExposureMask;
   swa.override_redirect = True;