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

 // Copyright 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/keyboard_driven_event_rewriter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/x/x11_util.h"
@@ skipping 17 matching lines @@
                               ui_keycode,
                               ui_flags,
                               event);
   event->xkey.keycode = x_keycode;
   event->xkey.state = x_state;
 }
 
 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)),
         keycode_left_(XKeysymToKeycode(display_, XK_Left)),
         keycode_right_(XKeysymToKeycode(display_, XK_Right)),
         keycode_return_(XKeysymToKeycode(display_, XK_Return)) {
   }
 
   virtual ~KeyboardDrivenEventRewriterTest() {}
 
  protected:
   std::string GetRewrittenEventAsString(ui::KeyboardCode ui_keycode,
                                         int ui_flags,
                                         ui::EventType ui_type,
                                         KeyCode x_keycode,
                                         unsigned int x_state) {
     XEvent xev;
     InitXKeyEvent(ui_keycode, ui_flags, ui_type, x_keycode, x_state, &xev);
     ui::KeyEvent keyevent(&xev, false /* is_char */);
     rewriter_.RewriteForTesting(&keyevent);
     return base::StringPrintf(
         "ui_flags=%d x_state=%u", keyevent.flags(), xev.xkey.state);
   }
 
   std::string GetExpectedResultAsString(int ui_flags, unsigned int x_state) {
     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_;
   const KeyCode keycode_left_;
   const KeyCode keycode_right_;
   const KeyCode keycode_return_;
 
   KeyboardDrivenEventRewriter rewriter_;
 
  private:
@@ skipping 76 matching lines @@
               GetRewrittenEventAsString(kTests[i].ui_keycode,
                                         kTests[i].ui_flags,
                                         ui::ET_KEY_PRESSED,
                                         kTests[i].x_keycode,
                                         kTests[i].x_state))
     << "Test case " << i;
   }
 }
 
 }  // namespace chromeos