Stop dispatching mouse move events for wheel scrolling in X11.

ui/events/test/events_test_utils_x11.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 "ui/events/test/events_test_utils_x11.h"
 
 #include <X11/extensions/XI2.h>
 #include <X11/keysym.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ skipping 273 matching lines @@
                                     valuators[i].value);
   }
 }
 
 void SetUpTouchPadForTest(int deviceid) {
   std::vector<int> device_list;
   device_list.push_back(deviceid);
 
   TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list);
   ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
-  manager->SetDeviceListForTest(std::vector<int>(), device_list);
+  manager->SetDeviceListForTest(std::vector<int>(), device_list,
+                                std::vector<int>());
 }
 
 void SetUpTouchDevicesForTest(const std::vector<int>& devices) {
   TouchFactory::GetInstance()->SetTouchDeviceForTest(devices);
   ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
-  manager->SetDeviceListForTest(devices, std::vector<int>());
+  manager->SetDeviceListForTest(devices, std::vector<int>(),
+                                std::vector<int>());
+}
+
+void SetUpPointerDevicesForTest(const std::vector<int>& devices) {
+  TouchFactory::GetInstance()->SetPointerDeviceForTest(devices);
+  ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
+  manager->SetDeviceListForTest(std::vector<int>(), std::vector<int>(),
+                                devices);
 }
 
 }  // namespace ui