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

chrome/test/chromedriver/keycode_text_conversion_x.cc

 // Copyright (c) 2013 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/chromedriver/keycode_text_conversion.h"
 
 #include <algorithm>
 #include <X11/keysym.h>
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
@@ skipping 172 matching lines @@
   *error_msg = std::string();
   int x_key_code = KeyboardCodeToXKeyCode(key_code);
   if (x_key_code == -1) {
     *text = std::string();
     return true;
   }
 
   XEvent event;
   memset(&event, 0, sizeof(XEvent));
   XKeyEvent* key_event = &event.xkey;
-  Display* display = ui::GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   if (!display) {
     *error_msg =
         "an X display is required for keycode conversions, consider using Xvfb";
     *text = std::string();
     return false;
   }
   key_event->display = display;
   key_event->keycode = x_key_code;
   if (modifiers & kShiftKeyModifierMask)
     key_event->state |= ShiftMask;
@@ skipping 56 matching lines @@
       found = true;
       break;
     }
   }
   if (found) {
     *key_code = test_code;
     *necessary_modifiers = test_modifiers;
   }
   return found;
 }