Extract touchscreen device management into a generic manager

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 bec1c4f6a8a711d48b9e3e7404040f08e821e99a..090a857b830a90256ce4b367ea7eee9ac40a5eb8 100644
--- a/ui/events/test/events_test_utils_x11.h
+++ b/ui/events/test/events_test_utils_x11.h
@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/events/x/device_data_manager.h"
+#include "ui/events/x/device_data_manager_x11.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/x/x11_types.h"
 
@@ -17,10 +17,10 @@ typedef union _XEvent XEvent;
 namespace ui {
 
 struct Valuator {
-  Valuator(DeviceDataManager::DataType type, double v)
+  Valuator(DeviceDataManagerX11::DataType type, double v)
       : data_type(type), value(v) {}
 
-  DeviceDataManager::DataType data_type;
+  DeviceDataManagerX11::DataType data_type;
   double value;
 };