Clean up onAccessibilityEvent() remove unused mojom fields

This CL also removes unused mojom field (WHITELISTED_PACKAGE_NAME_DEPRECATED).
Android side change (ag/9816677)

Test: ArcAccessibilityHelperBridgeTest.* passes
Bug: b/145316954
Change-Id: Ibac294eddbb45077ec4014b8b5c494599d724dd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935636Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Commit-Queue: Sara Kato <sarakato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721817}

chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc

@@ -350,16 +350,8 @@ extensions::EventRouter* ArcAccessibilityHelperBridge::GetEventRouter() const {
   return extensions::EventRouter::Get(profile_);
 }
 
-void ArcAccessibilityHelperBridge::OnAccessibilityEvent(
+void ArcAccessibilityHelperBridge::HandleFilterTypeAllEvent(
     mojom::AccessibilityEventDataPtr event_data) {
-  arc::mojom::AccessibilityFilterType filter_type =
-      GetFilterTypeForProfile(profile_);
-
-  DCHECK(
-      filter_type !=
-      arc::mojom::AccessibilityFilterType::WHITELISTED_PACKAGE_NAME_DEPRECATED);
-
-  if (filter_type == arc::mojom::AccessibilityFilterType::ALL) {
   if (event_data->event_type ==
       arc::mojom::AccessibilityEventType::ANNOUNCEMENT) {
     if (!event_data->eventText.has_value())
@@ -370,8 +362,7 @@ void ArcAccessibilityHelperBridge::OnAccessibilityEvent(
         extensions::api::accessibility_private::OnAnnounceForAccessibility::
             Create(*(event_data->eventText)));
     std::unique_ptr<extensions::Event> event(new extensions::Event(
-          extensions::events::
-              ACCESSIBILITY_PRIVATE_ON_ANNOUNCE_FOR_ACCESSIBILITY,
+        extensions::events::ACCESSIBILITY_PRIVATE_ON_ANNOUNCE_FOR_ACCESSIBILITY,
         extensions::api::accessibility_private::OnAnnounceForAccessibility::
             kEventName,
         std::move(event_args)));
@@ -385,8 +376,7 @@ void ArcAccessibilityHelperBridge::OnAccessibilityEvent(
   AXTreeSourceArc* tree_source = nullptr;
   bool is_notification_event = event_data->notification_key.has_value();
   if (is_notification_event) {
-      const std::string& notification_key =
-          event_data->notification_key.value();
+    const std::string& notification_key = event_data->notification_key.value();
 
     // This bridge must receive OnNotificationStateChanged call for the
     // notification_key before this receives an accessibility event for it.
@@ -451,8 +441,8 @@ void ArcAccessibilityHelperBridge::OnAccessibilityEvent(
     // as the view can take necessary actions, e.g. activate itself, etc.
     auto* surface_manager = ArcNotificationSurfaceManager::Get();
     if (surface_manager) {
-        ArcNotificationSurface* surface = surface_manager->GetArcSurface(
-            event_data->notification_key.value());
+      ArcNotificationSurface* surface =
+          surface_manager->GetArcSurface(event_data->notification_key.value());
       if (surface) {
         surface->GetAttachedHost()->NotifyAccessibilityEvent(
             ax::mojom::Event::kTextSelectionChanged, true);
@@ -461,18 +451,33 @@ void ArcAccessibilityHelperBridge::OnAccessibilityEvent(
   } else if (!is_notification_event) {
     UpdateWindowProperties(GetActiveWindow());
   }
+}
 
-    return;
-  }
-
-  if (event_data->event_type !=
+void ArcAccessibilityHelperBridge::HandleFilterTypeFocusEvent(
+    mojom::AccessibilityEventDataPtr event_data) {
+  if (event_data.get()->node_data.size() == 1 &&
+      event_data->event_type ==
           arc::mojom::AccessibilityEventType::VIEW_FOCUSED)
-    return;
-
-  CHECK_EQ(1U, event_data.get()->node_data.size());
     DispatchFocusChange(event_data.get()->node_data[0].get(), profile_);
 }
 
+void ArcAccessibilityHelperBridge::OnAccessibilityEvent(
+    mojom::AccessibilityEventDataPtr event_data) {
+  arc::mojom::AccessibilityFilterType filter_type =
+      GetFilterTypeForProfile(profile_);
+
+  switch (filter_type) {
+    case arc::mojom::AccessibilityFilterType::ALL:
+      HandleFilterTypeAllEvent(std::move(event_data));
+      break;
+    case arc::mojom::AccessibilityFilterType::FOCUS:
+      HandleFilterTypeFocusEvent(std::move(event_data));
+      break;
+    case arc::mojom::AccessibilityFilterType::OFF:
+      break;
+  }
+}
+
 void ArcAccessibilityHelperBridge::OnNotificationStateChanged(
     const std::string& notification_key,
     arc::mojom::AccessibilityNotificationStateType state) {

chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h

@@ -141,6 +141,8 @@ class ArcAccessibilityHelperBridge
   void SetExploreByTouchEnabled(bool enabled);
   void UpdateTreeIdOfNotificationSurface(const std::string& notification_key,
                                          ui::AXTreeID tree_id);
+  void HandleFilterTypeFocusEvent(mojom::AccessibilityEventDataPtr event_data);
+  void HandleFilterTypeAllEvent(mojom::AccessibilityEventDataPtr event_data);
 
   AXTreeSourceArc* GetFromTaskId(int32_t task_id);
   AXTreeSourceArc* CreateFromTaskId(int32_t task_id);

components/arc/mojom/accessibility_helper.mojom

@@ -306,10 +306,7 @@ enum AccessibilityFilterType {
   FOCUS,
 
   // Send a complete tree from the event source's root for every event.
-  ALL,
-
-  // Send complete subtrees for root nodes with whitelisted package names.
-  [MinVersion=2] WHITELISTED_PACKAGE_NAME_DEPRECATED
+  ALL
 };
 
 [Extensible]