Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/test/events_test_utils_x11.h

Index: ui/events/test/events_test_utils_x11.h
diff --git a/ui/events/test/events_test_utils_x11.h b/ui/events/test/events_test_utils_x11.h
index 68db92ad09334da9a3b6ad6235991ec6546c65e6..d40e0846dbd4567b4341c694c887f356fe14e988 100644
--- a/ui/events/test/events_test_utils_x11.h
+++ b/ui/events/test/events_test_utils_x11.h
@@ -6,10 +6,10 @@
 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/events/platform/x11/device_data_manager_x11.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
 #include "ui/gfx/x/x11_types.h"
 
 typedef union _XEvent XEvent;
@@ -90,10 +90,13 @@ class ScopedXI2Event {
 };
 
 // Initializes a test touchpad device for scroll events.
-void SetUpTouchPadForTest(unsigned int deviceid);
+void SetUpTouchPadForTest(int deviceid);
 
 // Initializes a list of touchscreen devices for touch events.
-void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices);
+void SetUpTouchDevicesForTest(const std::vector<int>& devices);
+
+// Initializes a list of non-touch, non-cmt pointer devices.
+void SetUpPointerDevicesForTest(const std::vector<int>& devices);
 
 }  // namespace ui