Move all event related devices from ui/events/ to ui/events/devices/

ui/events/BUILD.gn

Index: ui/events/BUILD.gn
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 594a3ff208d9498cbe1f7470d2dea141cd3e3fbb..67319948662d4731e777b51b84ab448967222590 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -18,11 +18,17 @@ component("events_base") {
   sources = [
     "android/scroller.cc",
     "android/scroller.h",
-    "device_data_manager.cc",
-    "device_data_manager.h",
-    "device_hotplug_event_observer.h",
-    "device_util_linux.cc",
-    "device_util_linux.h",
+    "devices/device_data_manager.cc",
+    "devices/device_data_manager.h",
+    "devices/device_hotplug_event_observer.h",
+    "devices/device_util_linux.cc",
+    "devices/device_util_linux.h",
+    "devices/input_device.cc",
+    "devices/input_device.h",
+    "devices/keyboard_device.cc",
+    "devices/keyboard_device.h",
+    "devices/touchscreen_device.cc",
+    "devices/touchscreen_device.h",
     "event_constants.h",
     "event_switches.cc",
     "event_switches.h",
@@ -32,10 +38,6 @@ component("events_base") {
     "gesture_event_details.h",
     "gestures/fling_curve.cc",
     "gestures/fling_curve.h",
-    "input_device.cc",
-    "input_device.h",
-    "keyboard_device.cc",
-    "keyboard_device.h",
     "keycodes/keyboard_code_conversion.cc",
     "keycodes/keyboard_code_conversion.h",
     "keycodes/keyboard_code_conversion_android.cc",
@@ -47,8 +49,6 @@ component("events_base") {
     "keycodes/keyboard_codes.h",
     "latency_info.cc",
     "latency_info.h",
-    "touchscreen_device.cc",
-    "touchscreen_device.h",
   ]
 
   defines = [ "EVENTS_BASE_IMPLEMENTATION" ]
@@ -70,10 +70,10 @@ component("events_base") {
     configs += [ "//build/config/linux:x11" ]
 
     sources += [
+      "devices/device_data_manager_x11.cc",
+      "devices/device_data_manager_x11.h",
       "keycodes/keyboard_code_conversion_x.cc",
       "keycodes/keyboard_code_conversion_x.h",
-      "x/device_data_manager_x11.cc",
-      "x/device_data_manager_x11.h",
       "x/device_list_cache_x.cc",
       "x/device_list_cache_x.h",
       "x/hotplug_event_handler_x11.cc",
@@ -286,6 +286,7 @@ test("events_unittests") {
   sources = [
     "android/scroller_unittest.cc",
     "cocoa/events_mac_unittest.mm",
+    "devices/device_data_manager_x11_unittest.cc",
     "event_dispatcher_unittest.cc",
     "event_processor_unittest.cc",
     "event_rewriter_unittest.cc",
@@ -302,7 +303,6 @@ test("events_unittests") {
     "keycodes/dom4/keycode_converter_unittest.cc",
     "latency_info_unittest.cc",
     "platform/platform_event_source_unittest.cc",
-    "x/device_data_manager_x11_unittest.cc",
     "x/events_x_unittest.cc",
   ]
 
@@ -325,7 +325,7 @@ test("events_unittests") {
     deps += [ "//ui/gfx/x" ]
   } else {
     sources -= [
-      "x/device_data_manager_x11_unittest.cc",
+      "devices/device_data_manager_x11_unittest.cc",
       "x/events_x_unittest.cc",
     ]
   }