Revert 263726 "x11: Remove X11 message-pump."

trunk/src/ui/gl/gl_surface_x11.cc

Index: trunk/src/ui/gl/gl_surface_x11.cc
===================================================================
--- trunk/src/ui/gl/gl_surface_x11.cc	(revision 263732)
+++ trunk/src/ui/gl/gl_surface_x11.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "base/message_loop/message_loop.h"
 #include "third_party/mesa/src/include/GL/osmesa.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
@@ -80,7 +79,7 @@
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
     gfx::AcceleratedWidget window)
     : GLSurfaceOSMesa(OSMESA_BGRA, gfx::Size(1, 1)),
-      xdisplay_(gfx::GetXDisplay()),
+      xdisplay_(base::MessagePumpForUI::GetDefaultXDisplay()),
       window_graphics_context_(0),
       window_(window),
       pixmap_graphics_context_(0),
@@ -95,7 +94,7 @@
   if (initialized)
     return true;
 
-  if (!gfx::GetXDisplay()) {
+  if (!base::MessagePumpForUI::GetDefaultXDisplay()) {
     LOG(ERROR) << "XOpenDisplay failed.";
     return false;
   }
@@ -342,7 +341,7 @@
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
-  return gfx::GetXDisplay();
+  return base::MessagePumpForUI::GetDefaultXDisplay();
 }
 
 }  // namespace gfx