Don't explicitly initialize ArcAccessibilityHelperBridge in Profile

Use the standard creation path for KeyedServices.

Bug: 268984
Change-Id: Id4a555cad9a64d00376e16cc1d072f2bf39b0e3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1852578Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706276}

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

@@ -110,6 +110,9 @@ class ArcAccessibilityHelperBridgeFactory
     return base::Singleton<ArcAccessibilityHelperBridgeFactory>::get();
   }
 
+ protected:
+  bool ServiceIsCreatedWithBrowserContext() const override { return true; }
+
  private:
   friend struct base::DefaultSingletonTraits<
       ArcAccessibilityHelperBridgeFactory>;
@@ -182,6 +185,11 @@ arc::mojom::CaptionStylePtr GetCaptionStyleFromPrefs(PrefService* prefs) {
   return style;
 }
 
+// static
+void ArcAccessibilityHelperBridge::CreateFactory() {
+  ArcAccessibilityHelperBridgeFactory::GetInstance();
+}
+
 // static
 ArcAccessibilityHelperBridge*
 ArcAccessibilityHelperBridge::GetForBrowserContext(

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

@@ -53,6 +53,9 @@ class ArcAccessibilityHelperBridge
       public arc::ArcInputMethodManagerService::Observer,
       public ash::ArcNotificationSurfaceManager::Observer {
  public:
+  // Builds the ArcAccessibilityHelperBridgeFactory.
+  static void CreateFactory();
+
   // Returns singleton instance for the given BrowserContext,
   // or nullptr if the browser |context| is not allowed to use ARC.
   static ArcAccessibilityHelperBridge* GetForBrowserContext(

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -110,6 +110,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/android_sms/android_sms_service_factory.h"
+#include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
 #include "chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h"
 #include "chrome/browser/chromeos/crostini/crostini_registry_service_factory.h"
 #include "chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher.h"
@@ -236,6 +237,9 @@ void ChromeBrowserMainExtraPartsProfiles::
   AccountConsistencyModeManagerFactory::GetInstance();
   AccountInvestigatorFactory::GetInstance();
   AccountReconcilorFactory::GetInstance();
+#if defined(OS_CHROMEOS)
+  arc::ArcAccessibilityHelperBridge::CreateFactory();
+#endif
   AutocompleteClassifierFactory::GetInstance();
   autofill::PersonalDataManagerFactory::GetInstance();
 #if BUILDFLAG(ENABLE_BACKGROUND_CONTENTS)

chrome/browser/profiles/profile_impl.cc

@@ -171,7 +171,6 @@
 #include "chrome/browser/chromeos/android_sms/android_sms_app_manager.h"
 #include "chrome/browser/chromeos/android_sms/android_sms_pairing_state_tracker_impl.h"
 #include "chrome/browser/chromeos/android_sms/android_sms_service_factory.h"
-#include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
 #include "chrome/browser/chromeos/arc/session/arc_service_launcher.h"
 #include "chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.h"
 #include "chrome/browser/chromeos/cryptauth/gcm_device_info_provider_impl.h"
@@ -975,7 +974,6 @@ void ProfileImpl::OnLocaleReady() {
 
 #if defined(OS_CHROMEOS)
   arc::ArcServiceLauncher::Get()->MaybeSetProfile(this);
-  arc::ArcAccessibilityHelperBridge::GetForBrowserContext(this);
 #endif
 
   FullBrowserTransitionManager::Get()->OnProfileCreated(this);