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

chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc

Index: chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc b/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc
index bad1aaa8cf6523b1f7407009ec07636772b7b34c..3f4adec6d3e9591c82b7594800a586cff986dcd2 100644
--- a/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc
@@ -35,7 +35,7 @@ void InitXKeyEvent(ui::KeyboardCode ui_keycode,
 class KeyboardDrivenEventRewriterTest : public testing::Test {
  public:
   KeyboardDrivenEventRewriterTest()
-      : display_(ui::GetXDisplay()),
+      : display_(gfx::GetXDisplay()),
         keycode_a_(XKeysymToKeycode(display_, XK_a)),
         keycode_up_(XKeysymToKeycode(display_, XK_Up)),
         keycode_down_(XKeysymToKeycode(display_, XK_Down)),
@@ -64,7 +64,7 @@ class KeyboardDrivenEventRewriterTest : public testing::Test {
     return base::StringPrintf("ui_flags=%d x_state=%u", ui_flags, x_state);
   }
 
-  Display* display_;
+  XDisplay* display_;
   const KeyCode keycode_a_;
   const KeyCode keycode_up_;
   const KeyCode keycode_down_;