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

ui/events/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
-static_library("dom4_keycode_converter") {
+static_library("dom_keycode_converter") {
   sources = [
-    "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",
   ]
 
   deps = [
     "//base",
   ]
 }
 
 component("events_base") {
   sources = [
     "android/scroller.cc",
@@ skipping 19 matching lines @@
     "keycodes/keyboard_code_conversion_win.cc",
     "keycodes/keyboard_code_conversion_win.h",
     "keycodes/keyboard_codes.h",
     "latency_info.cc",
     "latency_info.h",
   ]
 
   defines = [ "EVENTS_BASE_IMPLEMENTATION" ]
 
   deps = [
-    ":dom4_keycode_converter",
+    ":dom_keycode_converter",
     "//base/third_party/dynamic_annotations",
     "//skia",
   ]
 
   public_deps = [
     "//base",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
@@ skipping 43 matching lines @@
     "null_event_targeter.h",
     "win/events_win.cc",
   ]
 
   defines = [ "EVENTS_IMPLEMENTATION" ]
 
   public_deps = [
     ":events_base",
   ]
   deps = [
-    ":dom4_keycode_converter",
+    ":dom_keycode_converter",
     ":gesture_detection",
     "//base/third_party/dynamic_annotations",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
   if (use_x11) {
     sources += [ "x/events_x.cc" ]
     configs += [
@@ skipping 162 matching lines @@
     "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",
-    "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",
   ]
 
   deps = [
-    ":dom4_keycode_converter",
+    ":dom_keycode_converter",
     ":events",
     ":events_base",
     ":gesture_detection",
     ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//skia",
     "//testing/gtest",
     "//third_party/WebKit/public:blink_headers",
     "//ui/events/devices",
@@ skipping 42 matching lines @@
 if (is_nacl) {
   source_set("latency_info") {
     sources = [
       "ipc/latency_info_param_traits.cc",
       "ipc/latency_info_param_traits.h",
       "latency_info.cc",
       "latency_info.h",
     ]
   }
 }