Clean up LatencyInfo and RWHLatencyTracker.

ui/events/mojo/latency_info_struct_traits.cc

Index: ui/events/mojo/latency_info_struct_traits.cc
diff --git a/ui/events/mojo/latency_info_struct_traits.cc b/ui/events/mojo/latency_info_struct_traits.cc
index ef7db5f3ee96a6827cec100b38eb0a7ba85ddbb2..d70e95768ed81b3cb850a6fb9691f22abcd0547a 100644
--- a/ui/events/mojo/latency_info_struct_traits.cc
+++ b/ui/events/mojo/latency_info_struct_traits.cc
@@ -62,21 +62,9 @@ ui::mojom::LatencyComponentType UILatencyComponentTypeToMojo(
     case ui::INPUT_EVENT_LATENCY_GENERATE_SCROLL_UPDATE_FROM_MOUSE_WHEEL:
       return ui::mojom::LatencyComponentType::
           INPUT_EVENT_LATENCY_GENERATE_SCROLL_UPDATE_FROM_MOUSE_WHEEL;
-    case ui::INPUT_EVENT_LATENCY_TERMINATED_MOUSE_COMPONENT:
+    case ui::INPUT_EVENT_LATENCY_TERMINATED_NO_SWAP_COMPONENT:
       return ui::mojom::LatencyComponentType::
-          INPUT_EVENT_LATENCY_TERMINATED_MOUSE_COMPONENT;
-    case ui::INPUT_EVENT_LATENCY_TERMINATED_MOUSE_WHEEL_COMPONENT:
-      return ui::mojom::LatencyComponentType::
-          INPUT_EVENT_LATENCY_TERMINATED_MOUSE_WHEEL_COMPONENT;
-    case ui::INPUT_EVENT_LATENCY_TERMINATED_KEYBOARD_COMPONENT:
-      return ui::mojom::LatencyComponentType::
-          INPUT_EVENT_LATENCY_TERMINATED_KEYBOARD_COMPONENT;
-    case ui::INPUT_EVENT_LATENCY_TERMINATED_TOUCH_COMPONENT:
-      return ui::mojom::LatencyComponentType::
-          INPUT_EVENT_LATENCY_TERMINATED_TOUCH_COMPONENT;
-    case ui::INPUT_EVENT_LATENCY_TERMINATED_GESTURE_COMPONENT:
-      return ui::mojom::LatencyComponentType::
-          INPUT_EVENT_LATENCY_TERMINATED_GESTURE_COMPONENT;
+          INPUT_EVENT_LATENCY_TERMINATED_NO_SWAP_COMPONENT;
     case ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT:
       return ui::mojom::LatencyComponentType::
           INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT;
@@ -145,20 +133,8 @@ ui::LatencyComponentType MojoLatencyComponentTypeToUI(
         INPUT_EVENT_LATENCY_GENERATE_SCROLL_UPDATE_FROM_MOUSE_WHEEL:
       return ui::INPUT_EVENT_LATENCY_GENERATE_SCROLL_UPDATE_FROM_MOUSE_WHEEL;
     case ui::mojom::LatencyComponentType::
-        INPUT_EVENT_LATENCY_TERMINATED_MOUSE_COMPONENT:
-      return ui::INPUT_EVENT_LATENCY_TERMINATED_MOUSE_COMPONENT;
-    case ui::mojom::LatencyComponentType::
-        INPUT_EVENT_LATENCY_TERMINATED_MOUSE_WHEEL_COMPONENT:
-      return ui::INPUT_EVENT_LATENCY_TERMINATED_MOUSE_WHEEL_COMPONENT;
-    case ui::mojom::LatencyComponentType::
-        INPUT_EVENT_LATENCY_TERMINATED_KEYBOARD_COMPONENT:
-      return ui::INPUT_EVENT_LATENCY_TERMINATED_KEYBOARD_COMPONENT;
-    case ui::mojom::LatencyComponentType::
-        INPUT_EVENT_LATENCY_TERMINATED_TOUCH_COMPONENT:
-      return ui::INPUT_EVENT_LATENCY_TERMINATED_TOUCH_COMPONENT;
-    case ui::mojom::LatencyComponentType::
-        INPUT_EVENT_LATENCY_TERMINATED_GESTURE_COMPONENT:
-      return ui::INPUT_EVENT_LATENCY_TERMINATED_GESTURE_COMPONENT;
+        INPUT_EVENT_LATENCY_TERMINATED_NO_SWAP_COMPONENT:
+      return ui::INPUT_EVENT_LATENCY_TERMINATED_NO_SWAP_COMPONENT;
     case ui::mojom::LatencyComponentType::
         INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT:
       return ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT;