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

chrome/test/webdriver/keycode_text_conversion_x.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/webdriver/keycode_text_conversion.h"
 
 #include <algorithm>
 #include <X11/keysym.h>
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
@@ skipping 169 matching lines @@
 }  // namespace
 
 std::string ConvertKeyCodeToText(ui::KeyboardCode key_code, int modifiers) {
   int x_key_code = KeyboardCodeToXKeyCode(key_code);
   if (x_key_code == -1)
     return "";
 
   XEvent event;
   memset(&event, 0, sizeof(XEvent));
   XKeyEvent* key_event = &event.xkey;
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   key_event->display = display;
   key_event->keycode = x_key_code;
   if (modifiers & automation::kShiftKeyMask)
     key_event->state |= ShiftMask;
   if (modifiers & automation::kControlKeyMask)
     key_event->state |= ControlMask;
 
   // Make a best attempt for non-standard modifiers.
   int x_modifier;
   if (modifiers & automation::kAltKeyMask &&
@@ skipping 41 matching lines @@
     }
   }
   if (found) {
     *key_code = test_code;
     *necessary_modifiers = test_modifiers;
   }
   return found;
 }
 
 }  // namespace webdriver