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

trunk/src/ash/display/mirror_window_controller.cc

Index: trunk/src/ash/display/mirror_window_controller.cc
===================================================================
--- trunk/src/ash/display/mirror_window_controller.cc	(revision 223638)
+++ trunk/src/ash/display/mirror_window_controller.cc	(working copy)
@@ -34,10 +34,6 @@
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/native_widget_types.h"
 
-#if defined(USE_X11)
-#include "ui/base/x/x11_util.h"
-#endif
-
 namespace ash {
 namespace internal {
 namespace {
@@ -47,7 +43,8 @@
 void DisableInput(XID window) {
   long event_mask = ExposureMask | VisibilityChangeMask |
       StructureNotifyMask | PropertyChangeMask;
-  XSelectInput(ui::GetXDisplay(), window, event_mask);
+  XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(),
+               window, event_mask);
 }
 #endif