Fix ARC++ accessibility focus events not propagating to Magnifier

Magnifier correctly follow focus again in ARC++ apps - fixes regression due to migration of full-screen and docked magnifiers to use chrome.automation events to control magnifier.

AX-Relnotes: N/A.
Bug: 1154364
Change-Id: I67d3b2ec502ec8bc3f9bb5f249be75b7434d7dd7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2568432Reviewed-by: Hiroki Sato <hirokisato@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Commit-Queue: Hiroki Sato <hirokisato@chromium.org>
Auto-Submit: Josiah Krutz <josiahk@google.com>
Cr-Commit-Position: refs/heads/master@{#832655}

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

@@ -34,6 +34,7 @@
 #include "components/language/core/browser/pref_names.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
+#include "ui/accessibility/accessibility_features.h"
 #include "ui/accessibility/ax_action_data.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/aura/client/aura_constants.h"
@@ -620,7 +621,10 @@ ArcAccessibilityHelperBridge::GetFilterTypeForProfile(Profile* profile) {
 
   if (accessibility_manager->IsSelectToSpeakEnabled() ||
       accessibility_manager->IsSwitchAccessEnabled() ||
-      accessibility_manager->IsSpokenFeedbackEnabled()) {
+      accessibility_manager->IsSpokenFeedbackEnabled() ||
+      (features::IsMagnifierNewFocusFollowingEnabled() &&
+       (magnification_manager->IsMagnifierEnabled() ||
+        magnification_manager->IsDockedMagnifierEnabled()))) {
     return arc::mojom::AccessibilityFilterType::ALL;
   }
 
@@ -737,9 +741,11 @@ void ArcAccessibilityHelperBridge::UpdateEnabledFeature() {
   if (!accessibility_manager || !magnification_manager)
     return;
 
-  is_focus_event_enabled_ = magnification_manager->IsMagnifierEnabled() ||
-                            magnification_manager->IsDockedMagnifierEnabled() ||
-                            accessibility_manager->IsFocusHighlightEnabled();
+  is_focus_event_enabled_ =
+      (!features::IsMagnifierNewFocusFollowingEnabled() &&
+       (magnification_manager->IsMagnifierEnabled() ||
+        magnification_manager->IsDockedMagnifierEnabled())) ||
+      accessibility_manager->IsFocusHighlightEnabled();
 
   use_full_focus_mode_ = accessibility_manager->IsSwitchAccessEnabled() ||
                          accessibility_manager->IsSpokenFeedbackEnabled();