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

trunk/src/ui/aura/demo/demo_main.cc

Index: trunk/src/ui/aura/demo/demo_main.cc
===================================================================
--- trunk/src/ui/aura/demo/demo_main.cc	(revision 263732)
+++ trunk/src/ui/aura/demo/demo_main.cc	(working copy)
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if defined(USE_X11)
+#include <X11/Xlib.h>
+#endif
+
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
@@ -24,7 +28,7 @@
 #include "ui/gl/gl_surface.h"
 
 #if defined(USE_X11)
-#include "ui/gfx/x/x11_connection.h"
+#include "base/message_loop/message_pump_x11.h"
 #endif
 
 namespace {
@@ -107,7 +111,7 @@
 #if defined(USE_X11)
   // This demo uses InProcessContextFactory which uses X on a separate Gpu
   // thread.
-  gfx::InitializeThreadedX11();
+  XInitThreads();
 #endif
 
   gfx::GLSurface::InitializeOneOff();