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

trunk/src/ui/events/x/touch_factory_x11.cc

Index: trunk/src/ui/events/x/touch_factory_x11.cc
===================================================================
--- trunk/src/ui/events/x/touch_factory_x11.cc	(revision 233415)
+++ trunk/src/ui/events/x/touch_factory_x11.cc	(working copy)
@@ -18,7 +18,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "ui/events/event_switches.h"
-#include "ui/events/x/device_data_manager.h"
 #include "ui/events/x/device_list_cache_x.h"
 #include "ui/gfx/x/x11_types.h"
 
@@ -30,8 +29,10 @@
       touch_events_disabled_(false),
       touch_device_list_(),
       id_generator_(0) {
-  if (!DeviceDataManager::GetInstance()->IsXInput2Available())
+#if defined(USE_AURA)
+  if (!base::MessagePumpForUI::HasXInput2())
     return;
+#endif
 
   XDisplay* display = gfx::GetXDisplay();
   UpdateDeviceList(display);
@@ -100,9 +101,6 @@
   }
 #endif
 
-  if (!DeviceDataManager::GetInstance()->IsXInput2Available())
-    return;
-
   // Instead of asking X for the list of devices all the time, let's maintain a
   // list of pointer devices we care about.
   // It should not be necessary to select for slave devices. XInput2 provides