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

trunk/src/ui/views/test/ui_controls_factory_desktop_aurax11.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 // X macro fail.
 #if defined(RootWindow)
 #undef RootWindow
 #endif
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/test/ui_controls_aura.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/events/test/platform_event_waiter.h"
-#include "ui/gfx/x/x11_connection.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace views {
 namespace test {
 namespace {
 
 using ui_controls::DOWN;
 using ui_controls::LEFT;
 using ui_controls::MIDDLE;
 using ui_controls::MouseButton;
@@ skipping 239 matching lines @@
 
   // Input-only window used for events.
   ::Window x_window_;
 
   DISALLOW_COPY_AND_ASSIGN(UIControlsDesktopX11);
 };
 
 }  // namespace
 
 UIControlsAura* CreateUIControlsDesktopAura() {
-  // The constructor of UIControlsDesktopX11 needs X11 connection to be
-  // initialized.
-  gfx::InitializeThreadedX11();
+  // The constructor of UIControlsDesktopX11 needs XInitThreads to be called.
+  XInitThreads();
   return new UIControlsDesktopX11();
 }
 
 }  // namespace test
 }  // namespace views