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

ui/compositor/test/test_compositor_host_x11.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 "ui/compositor/test/test_compositor_host.h"
 
 #include <X11/Xlib.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 class TestCompositorHostX11 : public TestCompositorHost,
                               public CompositorDelegate {
  public:
   TestCompositorHostX11(const gfx::Rect& bounds);
   virtual ~TestCompositorHostX11();
 
  private:
@@ skipping 19 matching lines @@
 
 TestCompositorHostX11::TestCompositorHostX11(const gfx::Rect& bounds)
     : bounds_(bounds),
       method_factory_(this) {
 }
 
 TestCompositorHostX11::~TestCompositorHostX11() {
 }
 
 void TestCompositorHostX11::Show() {
-  Display* display = GetXDisplay();
+  XDisplay* display = gfx::GetXDisplay();
   XSetWindowAttributes swa;
   swa.event_mask = StructureNotifyMask | ExposureMask;
   swa.override_redirect = True;
   window_ = XCreateWindow(
       display,
       RootWindow(display, DefaultScreen(display)),  // parent
       bounds_.x(), bounds_.y(), bounds_.width(), bounds_.height(),
       0,  // border width
       CopyFromParent,  // depth
       InputOutput,
@@ skipping 29 matching lines @@
   if (compositor_.get())
     compositor_->Draw();
 }
 
 // static
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostX11(bounds);
 }
 
 }  // namespace ui