compositor: Reuse GetXDisplay() function from x11_util.h

ui/compositor/test/test_compositor_host_linux.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 "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.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/rect.h"
 
-#include <X11/Xlib.h>
-
 namespace ui {
 
 class TestCompositorHostLinux : public TestCompositorHost,
                                 public CompositorDelegate {
  public:
   TestCompositorHostLinux(const gfx::Rect& bounds);
   virtual ~TestCompositorHostLinux();
 
  private:
   // Overridden from TestCompositorHost:
@@ skipping 18 matching lines @@
 
 TestCompositorHostLinux::TestCompositorHostLinux(const gfx::Rect& bounds)
     : bounds_(bounds),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 TestCompositorHostLinux::~TestCompositorHostLinux() {
 }
 
 void TestCompositorHostLinux::Show() {
-  Display* display = base::MessagePumpForUI::GetDefaultXDisplay();
+  Display* display = 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 28 matching lines @@
   if (compositor_.get())
     compositor_->Draw(false);
 }
 
 // static
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostLinux(bounds);
 }
 
 }  // namespace ui