Revert 223621 "x11: Prefer using ui::GetXDisplay() over getting ..."

trunk/src/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc

Index: trunk/src/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc	(revision 223638)
+++ trunk/src/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc	(working copy)
@@ -64,7 +64,7 @@
   DCHECK(!in_move_loop_);  // Can only handle one nested loop at a time.
   in_move_loop_ = true;
 
-  Display* display = ui::GetXDisplay();
+  Display* display = base::MessagePumpX11::GetDefaultXDisplay();
 
   // Creates an invisible, InputOnly toplevel window. This window will receive
   // all mouse movement for drags. It turns out that normal windows doing a
@@ -116,7 +116,7 @@
   // the chrome process.
 
   // Ungrab before we let go of the window.
-  Display* display = ui::GetXDisplay();
+  Display* display = base::MessagePumpX11::GetDefaultXDisplay();
   XUngrabPointer(display, CurrentTime);
 
   base::MessagePumpX11::Current()->RemoveDispatcherForWindow(
@@ -129,7 +129,7 @@
 }
 
 bool X11WholeScreenMoveLoop::GrabPointerWithCursor(gfx::NativeCursor cursor) {
-  Display* display = ui::GetXDisplay();
+  Display* display = base::MessagePumpX11::GetDefaultXDisplay();
   XGrabServer(display);
   XUngrabPointer(display, CurrentTime);
   int ret = XGrabPointer(