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

content/browser/aura/software_output_device_x11.h

 // 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.
 
 #ifndef CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
 #define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_
 
 #include "cc/output/software_output_device.h"
-#include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 class Compositor;
 }
 
 namespace content {
 
 class SoftwareOutputDeviceX11 : public cc::SoftwareOutputDevice {
  public:
   explicit SoftwareOutputDeviceX11(ui::Compositor* compositor);
 
   virtual ~SoftwareOutputDeviceX11();
 
   virtual void Resize(gfx::Size viewport_size) OVERRIDE;
 
   virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE;
 
  private:
   void ClearImage();
 
   ui::Compositor* compositor_;
-  Display* display_;
+  XDisplay* display_;
   GC gc_;
   XImage* image_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_