Consolidate ui/events/keycodes/dom[34]/ into .../dom/

ui/events/events.gyp

Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index f82024157f22ea4760ea3c15b70fbe16cd82a381..35017550b3cc837bbbb586a1fb625c3ab66567e0 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -8,20 +8,20 @@
   },
   'targets': [
     {
-      # GN version: //ui/events:dom4_keycode_converter
-      'target_name': 'dom4_keycode_converter',
+      # GN version: //ui/events:dom_keycode_converter
+      'target_name': 'dom_keycode_converter',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'keycodes/dom3/dom_code.h',
-        'keycodes/dom3/dom_key.h',
-        'keycodes/dom3/dom_key_data.h',
-        'keycodes/dom4/keycode_converter.cc',
-        'keycodes/dom4/keycode_converter.h',
-        'keycodes/dom4/keycode_converter_data.h',
+        'keycodes/dom/dom_code.h',
+        'keycodes/dom/dom_key.h',
+        'keycodes/dom/dom_key_data.h',
+        'keycodes/dom/keycode_converter.cc',
+        'keycodes/dom/keycode_converter.h',
+        'keycodes/dom/keycode_converter_data.h',
       ],
     },
     {
@@ -34,7 +34,7 @@
         '<(DEPTH)/skia/skia.gyp:skia',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
-        'dom4_keycode_converter',
+        'dom_keycode_converter',
       ],
       'defines': [
         'EVENTS_BASE_IMPLEMENTATION',
@@ -93,7 +93,7 @@
         '<(DEPTH)/skia/skia.gyp:skia',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
-        'dom4_keycode_converter',
+        'dom_keycode_converter',
         'events_base',
         'gesture_detection',
       ],
@@ -345,7 +345,7 @@
         '../gfx/gfx.gyp:gfx_geometry',
         '../gfx/gfx.gyp:gfx_test_support',
         'devices/events_devices.gyp:events_devices',
-        'dom4_keycode_converter',
+        'dom_keycode_converter',
         'events',
         'events_base',
         'events_test_support',
@@ -375,7 +375,7 @@
         'gestures/fling_curve_unittest.cc',
         'gestures/gesture_provider_aura_unittest.cc',
         'gestures/motion_event_aura_unittest.cc',
-        'keycodes/dom4/keycode_converter_unittest.cc',
+        'keycodes/dom/keycode_converter_unittest.cc',
         'keycodes/keyboard_code_conversion_unittest.cc',
         'latency_info_unittest.cc',
         'platform/platform_event_source_unittest.cc',