Revert 233414 "x11: Move XInput2 availability information out of..."

trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc

Index: trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc	(revision 233415)
+++ trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc	(working copy)
@@ -25,7 +25,6 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/x/device_data_manager.h"
-#include "ui/events/x/device_list_cache_x.h"
 #include "ui/events/x/touch_factory_x11.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
@@ -935,7 +934,7 @@
   XSelectInput(xdisplay_, xwindow_, event_mask);
   XFlush(xdisplay_);
 
-  if (ui::IsXInput2Available())
+  if (base::MessagePumpForUI::HasXInput2())
     ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_);
 
   // TODO(erg): We currently only request window deletion events. We also