Move Account Manager from //ash/components to //components/account_manager_core
This move is required to make Account Manager buildable on Lacros - for
running Lacros browser_tests - which do not have access to Mojo crosapi
and thus, cannot talk to Account Manager.
Bug: 1213874
Change-Id: I2d03a3f1ec8e6243c0aaea7d3832afd5299ad005
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2928561
Commit-Queue: Kush Sinha <[email protected]>
Reviewed-by: Glen Robertson <[email protected]>
Reviewed-by: Boris Sazonov <[email protected]>
Reviewed-by: Maksim Orlovich <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Reviewed-by: Anastasiia N <[email protected]>
Reviewed-by: David Roger <[email protected]>
Cr-Commit-Position: refs/heads/master@{#898174}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 53cf44aa..40a4dce 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -260,7 +260,6 @@
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/components/account_manager/account_manager.h"
#include "ash/components/audio/audio_devices_pref_handler_impl.h"
#include "ash/public/cpp/ash_pref_names.h"
#include "ash/public/cpp/ash_prefs.h"
@@ -367,6 +366,7 @@
#include "chromeos/services/device_sync/public/cpp/device_sync_prefs.h"
#include "chromeos/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/timezone/timezone_resolver.h"
+#include "components/account_manager_core/chromeos/account_manager.h"
#include "components/arc/arc_prefs.h"
#include "components/onc/onc_pref_names.h"
#include "components/quirks/quirks_manager.h"
@@ -1189,7 +1189,7 @@
arc::prefs::RegisterProfilePrefs(registry);
ArcAppListPrefs::RegisterProfilePrefs(registry);
certificate_manager::CertificatesHandler::RegisterProfilePrefs(registry);
- ash::AccountManager::RegisterPrefs(registry);
+ account_manager::AccountManager::RegisterPrefs(registry);
ash::ApkWebAppService::RegisterProfilePrefs(registry);
ash::app_time::AppActivityRegistry::RegisterProfilePrefs(registry);
ash::app_time::AppTimeController::RegisterProfilePrefs(registry);
