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

trunk/src/ui/aura/bench/bench_main.cc

Index: trunk/src/ui/aura/bench/bench_main.cc
===================================================================
--- trunk/src/ui/aura/bench/bench_main.cc	(revision 263732)
+++ trunk/src/ui/aura/bench/bench_main.cc	(working copy)
@@ -33,7 +33,6 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
-#include "ui/gfx/x/x11_connection.h"
 #include "ui/gl/gl_surface.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
@@ -41,6 +40,10 @@
 #endif
 #include "third_party/khronos/GLES2/gl2ext.h"
 
+#if defined(USE_X11)
+#include "base/message_loop/message_pump_x11.h"
+#endif
+
 using base::TimeTicks;
 using ui::Compositor;
 using ui::Layer;
@@ -291,7 +294,7 @@
 #if defined(USE_X11)
   // This demo uses InProcessContextFactory which uses X on a separate Gpu
   // thread.
-  gfx::InitializeThreadedX11();
+  XInitThreads();
 #endif
 
   gfx::GLSurface::InitializeOneOff();