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

ui/events/events.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   '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',
       ],
     },
     {
       # GN version: //ui/events:events_base
       'target_name': 'events_base',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
-        'dom4_keycode_converter',
+        'dom_keycode_converter',
       ],
       'defines': [
         'EVENTS_BASE_IMPLEMENTATION',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'android/scroller.cc',
         'android/scroller.h',
         'base_event_utils.cc',
         'base_event_utils.h',
@@ skipping 38 matching lines @@
     {
       # GN version: //ui/events
       'target_name': 'events',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
-        'dom4_keycode_converter',
+        'dom_keycode_converter',
         'events_base',
         'gesture_detection',
       ],
       'defines': [
         'EVENTS_IMPLEMENTATION',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'cocoa/cocoa_event_utils.h',
         'cocoa/cocoa_event_utils.mm',
@@ skipping 231 matching lines @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
         '../gfx/gfx.gyp:gfx',
         '../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',
         'gesture_detection',
         'gestures_blink',
         'platform/events_platform.gyp:events_platform',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'android/scroller_unittest.cc',
         'cocoa/events_mac_unittest.mm',
         'devices/x11/device_data_manager_x11_unittest.cc',
         'event_dispatcher_unittest.cc',
         'event_processor_unittest.cc',
         'event_rewriter_unittest.cc',
         'event_unittest.cc',
         'gesture_detection/bitset_32_unittest.cc',
         'gesture_detection/filtered_gesture_provider_unittest.cc',
         'gesture_detection/gesture_event_data_packet_unittest.cc',
         'gesture_detection/gesture_provider_unittest.cc',
         'gesture_detection/motion_event_buffer_unittest.cc',
         'gesture_detection/motion_event_generic_unittest.cc',
         'gesture_detection/snap_scroll_controller_unittest.cc',
         'gesture_detection/touch_disposition_gesture_filter_unittest.cc',
         'gesture_detection/velocity_tracker_unittest.cc',
         'gestures/blink/web_gesture_curve_impl_unittest.cc',
         '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',
         'x/events_x_unittest.cc',
       ],
       'include_dirs': [
         '../../testing/gmock/include',
       ],
       'conditions': [
         ['use_x11==1', {
@@ skipping 86 matching lines @@
               'dependencies': [
                 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }