Disabled xinput2 until edge cases can be fixed.

ui/events/devices/x11/device_data_manager_x11.cc

 // Copyright 2014 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 "ui/events/devices/x11/device_data_manager_x11.h"
 
 #include <stddef.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ skipping 753 matching lines @@
   valuator_max_[deviceid][data_type] = valuator_class_info->max;
   return IsCMTDataType(data_type);
 }
 
 void DeviceDataManagerX11::UpdateScrollClassDevice(
     XIScrollClassInfo* scroll_class_info,
     int deviceid) {
   DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum);
   ScrollInfo& info = scroll_data_[deviceid];
 
+  // xinput2 is disabled until edge cases are fixed.
+  bool xinput2_disabled = true;
+  if (xinput2_disabled) {

[bokan, 2016/06/29 18:34:24]

No need for the variable and if statement. Just return. Make the comment a TODO
and add a link to crbug.com/616308

+    return;
+  }
+
   bool legacy_scroll_available =
       (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0;
   // If the device's highest resolution is lower than the resolution of xinput1
   // then use xinput1's events instead (ie. don't configure smooth scrolling).
   if (legacy_scroll_available &&
       std::abs(scroll_class_info->increment) <= 1.0) {
     return;
   }
 
   switch (scroll_class_info->scroll_type) {
@@ skipping 96 matching lines @@
     } else {
       keyboards.erase(it);
       ++blocked_iter;
     }
   }
   // Notify base class of updated list.
   DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
 }
 
 }  // namespace ui