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

 // 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 "content/browser/renderer_host/web_input_event_aura.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 
 #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 {
 
 // Checks that MakeWebKeyboardEvent makes a DOM3 spec compliant key event.
 // crbug.com/127142
 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) {
 #if defined(USE_X11)
   XEvent xev;
   {
@@ skipping 24 matching lines @@
 // Checks that MakeWebKeyboardEvent returns a correct windowsKeyCode.
 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) {
 #if defined(USE_X11)
   XEvent xev;
   {
     // Press left Ctrl.
     ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
                                 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.
     EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode);
   }
   {
     // Press right Ctrl.
     ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
                                 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.
     EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode);
   }
 #elif defined(OS_WIN)
   // TODO(yusukes): Add tests for win_aura once keyboardEvent() in
   // third_party/WebKit/Source/web/win/WebInputEventFactory.cpp is modified
   // to return VKEY_[LR]XXX instead of VKEY_XXX.
   // https://bugs.webkit.org/show_bug.cgi?id=86694
 #endif
 }
 
 }  // namespace content