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

content/browser/renderer_host/web_input_event_aura_unittest.cc

Index: content/browser/renderer_host/web_input_event_aura_unittest.cc
diff --git a/content/browser/renderer_host/web_input_event_aura_unittest.cc b/content/browser/renderer_host/web_input_event_aura_unittest.cc
index 47a62beb9e217c27cd9ae0ba2ff926bb7fd53c67..b9ccaa740dcb97b361d989a42a4d866840d46f8e 100644
--- a/content/browser/renderer_host/web_input_event_aura_unittest.cc
+++ b/content/browser/renderer_host/web_input_event_aura_unittest.cc
@@ -11,7 +11,7 @@
 #if defined(USE_X11)
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
-#include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_types.h"
 #endif
 
 namespace content {
@@ -56,7 +56,7 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) {
                                 ui::VKEY_CONTROL,
                                 0,  // X does not set ControlMask for KeyPress.
                                 &xev);
-    xev.xkey.keycode = XKeysymToKeycode(ui::GetXDisplay(), XK_Control_L);
+    xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_L);
     ui::KeyEvent event(&xev, false /* is_char */);
     WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
     // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled.
@@ -68,7 +68,7 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) {
                                 ui::VKEY_CONTROL,
                                 0,  // X does not set ControlMask for KeyPress.
                                 &xev);
-    xev.xkey.keycode = XKeysymToKeycode(ui::GetXDisplay(), XK_Control_R);
+    xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_R);
     ui::KeyEvent event(&xev, false /* is_char */);
     WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
     // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled.