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

ash/display/display_controller_unittest.cc

Index: ash/display/display_controller_unittest.cc
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index 485e58291980a799e803fd41cec7baae1685375d..287b0e4f455ba25a4448deff9c9330b6536eace8 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -29,7 +29,7 @@
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_X11)
-#include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_types.h"
 #include <X11/Xlib.h>
 #undef RootWindow
 #endif
@@ -288,7 +288,7 @@ void GetPrimaryAndSeconary(aura::RootWindow** primary,
 
 std::string GetXWindowName(aura::RootWindow* window) {
   char* name = NULL;
-  XFetchName(ui::GetXDisplay(), window->GetAcceleratedWidget(), &name);
+  XFetchName(gfx::GetXDisplay(), window->GetAcceleratedWidget(), &name);
   std::string ret(name);
   XFree(name);
   return ret;