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

ash/display/display_controller_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 "ash/display/display_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
@@ skipping 11 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_X11)
-#include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_types.h"
 #include <X11/Xlib.h>
 #undef RootWindow
 #endif
 
 namespace ash {
 namespace {
 
 const char kDesktopBackgroundView[] = "DesktopBackgroundView";
 
 template<typename T>
@@ skipping 238 matching lines @@
 #if defined(USE_X11)
 void GetPrimaryAndSeconary(aura::RootWindow** primary,
                            aura::RootWindow** secondary) {
   *primary = Shell::GetPrimaryRootWindow();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   *secondary = root_windows[0] == *primary ? root_windows[1] : root_windows[0];
 }
 
 std::string GetXWindowName(aura::RootWindow* window) {
   char* name = NULL;
-  XFetchName(ui::GetXDisplay(), window->GetAcceleratedWidget(), &name);
+  XFetchName(gfx::GetXDisplay(), window->GetAcceleratedWidget(), &name);
   std::string ret(name);
   XFree(name);
   return ret;
 }
 #endif
 
 }  // namespace
 
 typedef test::AshTestBase DisplayControllerTest;
 
@@ skipping 933 matching lines @@
   EXPECT_EQ("aura_root_0", GetXWindowName(primary));
   EXPECT_EQ("aura_root_x", GetXWindowName(secondary));
 
   // Switching back to single display.
   UpdateDisplay("300x400");
   EXPECT_EQ("aura_root_0", GetXWindowName(Shell::GetPrimaryRootWindow()));
 }
 #endif
 
 }  // namespace ash