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

trunk/src/ui/events/x/device_list_cache_x.h

Index: trunk/src/ui/events/x/device_list_cache_x.h
===================================================================
--- trunk/src/ui/events/x/device_list_cache_x.h	(revision 233415)
+++ trunk/src/ui/events/x/device_list_cache_x.h	(working copy)
@@ -42,14 +42,7 @@
 
   void UpdateDeviceList(Display* display);
 
-  // Returns the list of devices associated with |display|. Uses the old X11
-  // protocol to get the list of the devices.
   const XDeviceList& GetXDeviceList(Display* display);
-
-  // Returns the list of devices associated with |display|. Uses the newer
-  // XINPUT2 protocol to get the list of devices. Before making this call, make
-  // sure that XInput2 support is available (e.g. by calling
-  // IsXInput2Available()).
   const XIDeviceList& GetXI2DeviceList(Display* display);
 
  private:
@@ -61,6 +54,8 @@
   std::map<Display*, XDeviceList> x_dev_list_map_;
   std::map<Display*, XIDeviceList> xi_dev_list_map_;
 
+  bool xi2_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceListCacheX);
 };