Move CrosSettings out from //chrome/browser
So that it can be referred from components, specifically there's
a plan for UserManager to depend on it (on moving more code
from ChromeUserManagerImpl to UserManagerBase).
Along with the plan, //components/user_manager is split into
two targets, so CrosSettings can keep depending on user_type.h,
while in future CLs, UserManager can keep depending on CrosSettings.
BUG=278643115
TEST=Tryjob
Change-Id: Ic1febe1efca1e0bba78e518771c5b668b6442d3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5439672
Reviewed-by: Fumitoshi Ukai <[email protected]>
Reviewed-by: David Roger <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Commit-Queue: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1284982}
diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn
index 89ca67f..5e4e397 100644
--- a/chrome/browser/ash/BUILD.gn
+++ b/chrome/browser/ash/BUILD.gn
@@ -3224,8 +3224,6 @@
"set_time_dialog.h",
"settings/about_flags.cc",
"settings/about_flags.h",
- "settings/cros_settings.cc",
- "settings/cros_settings.h",
"settings/cros_settings_holder.cc",
"settings/cros_settings_holder.h",
"settings/device_settings_cache.cc",
diff --git a/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h b/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h
index 12e24bd..ae26377 100644
--- a/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h
+++ b/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h
@@ -12,7 +12,7 @@
#include "chrome/browser/ash/app_mode/arc/arc_kiosk_app_data.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager_base.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
class PrefRegistrySimple;
diff --git a/chrome/browser/ash/app_mode/kiosk_app_manager_base.h b/chrome/browser/ash/app_mode/kiosk_app_manager_base.h
index e735e9c3..0dd94dbb 100644
--- a/chrome/browser/ash/app_mode/kiosk_app_manager_base.h
+++ b/chrome/browser/ash/app_mode/kiosk_app_manager_base.h
@@ -14,8 +14,8 @@
#include "base/path_service.h"
#include "chrome/browser/ash/app_mode/kiosk_app_data_delegate.h"
#include "chrome/browser/ash/app_mode/kiosk_system_session.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/common/chrome_paths.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "ui/gfx/image/image_skia.h"
#include "url/gurl.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.cc b/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.cc
index 6abebf0..70503ff 100644
--- a/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.cc
+++ b/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.cc
@@ -36,7 +36,6 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h"
@@ -46,6 +45,7 @@
#include "chrome/browser/net/system_network_context_manager.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension_constants.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/crosapi/mojom/chrome_app_kiosk_service.mojom.h"
#include "components/account_id/account_id.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h b/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h
index 889fdd1b..aa231cc3 100644
--- a/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h
+++ b/chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h
@@ -18,10 +18,10 @@
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
#include "chrome/browser/ash/extensions/external_cache.h"
#include "chrome/browser/ash/extensions/external_cache_delegate.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h"
#include "chrome/browser/chromeos/app_mode/chrome_kiosk_external_loader_broker.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/crosapi/mojom/chrome_app_kiosk_service.mojom.h"
#include "components/account_id/account_id.h"
#include "components/pref_registry/pref_registry_syncable.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_controller.cc b/chrome/browser/ash/app_mode/kiosk_controller.cc
index fbdcd5cf..e8fc13cc 100644
--- a/chrome/browser/ash/app_mode/kiosk_controller.cc
+++ b/chrome/browser/ash/app_mode/kiosk_controller.cc
@@ -23,8 +23,8 @@
#include "chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/common/chrome_switches.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "ui/wm/core/wm_core_switches.h"
namespace ash {
diff --git a/chrome/browser/ash/arc/arc_util.cc b/chrome/browser/ash/arc/arc_util.cc
index 6b12efd..339106f 100644
--- a/chrome/browser/ash/arc/arc_util.cc
+++ b/chrome/browser/ash/arc/arc_util.cc
@@ -6,6 +6,7 @@
#include <linux/magic.h>
#include <sys/statfs.h>
+
#include <map>
#include <set>
#include <string>
@@ -40,7 +41,6 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/arc/arc_web_contents_data.h"
#include "chrome/browser/profiles/profile.h"
@@ -50,6 +50,7 @@
#include "chrome/browser/ui/simple_message_box.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/ash/components/browser_context_helper/browser_context_helper.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/components/mgs/managed_guest_session_utils.h"
#include "components/embedder_support/user_agent_utils.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/arc/arc_util_unittest.cc b/chrome/browser/ash/arc/arc_util_unittest.cc
index af4407e..53e8025 100644
--- a/chrome/browser/ash/arc/arc_util_unittest.cc
+++ b/chrome/browser/ash/arc/arc_util_unittest.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
@@ -35,6 +34,7 @@
#include "chrome/test/base/testing_profile_manager.h"
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc b/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc
index 1dc1dc5..c7dd63a 100644
--- a/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc
+++ b/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc
@@ -11,7 +11,7 @@
#include "ash/components/arc/session/arc_bridge_service.h"
#include "base/functional/bind.h"
#include "base/memory/singleton.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/components/cdm_factory_daemon/cdm_factory_daemon_proxy_ash.h"
#include "content/public/browser/gpu_service_registry.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ash/attestation/platform_verification_flow.cc b/chrome/browser/ash/attestation/platform_verification_flow.cc
index 84b455d5..d618ee56 100644
--- a/chrome/browser/ash/attestation/platform_verification_flow.cc
+++ b/chrome/browser/ash/attestation/platform_verification_flow.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/ash/attestation/attestation_ca_client.h"
#include "chrome/browser/ash/attestation/certificate_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chromeos/ash/components/attestation/attestation_flow.h"
#include "chromeos/ash/components/attestation/attestation_flow_adaptive.h"
@@ -30,6 +29,7 @@
#include "chromeos/ash/components/dbus/attestation/interface.pb.h"
#include "chromeos/ash/components/dbus/constants/attestation_constants.h"
#include "chromeos/ash/components/dbus/dbus_thread_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/constants/dbus_switches.h"
#include "components/user_manager/user.h"
#include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc
index d95557b9..ccaaf8f 100644
--- a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc
+++ b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc
@@ -12,11 +12,11 @@
#include "base/logging.h"
#include "base/timer/timer.h"
#include "chrome/browser/ash/attestation/attestation_ca_client.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/attestation/attestation_flow_adaptive.h"
#include "chromeos/ash/components/cryptohome/cryptohome_parameters.h"
#include "chromeos/ash/components/dbus/attestation/attestation_client.h"
#include "chromeos/ash/components/dbus/constants/attestation_constants.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "content/public/browser/browser_thread.h"
#include "crypto/openssl_util.h"
#include "crypto/random.h"
diff --git a/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc b/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc
index 1e761e7..e6d8639af 100644
--- a/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc
+++ b/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc
@@ -22,7 +22,6 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_ash.h"
#include "chrome/browser/extensions/chrome_extension_function_details.h"
@@ -35,6 +34,7 @@
#include "chromeos/ash/components/dbus/attestation/interface.pb.h"
#include "chromeos/ash/components/dbus/constants/attestation_constants.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/components/kiosk/kiosk_utils.h"
#include "chromeos/dbus/tpm_manager/tpm_manager.pb.h"
diff --git a/chrome/browser/ash/borealis/borealis_features.cc b/chrome/browser/ash/borealis/borealis_features.cc
index 4d367451..d82bf3d 100644
--- a/chrome/browser/ash/borealis/borealis_features.cc
+++ b/chrome/browser/ash/borealis/borealis_features.cc
@@ -20,11 +20,11 @@
#include "chrome/browser/ash/guest_os/infra/cached_callback.h"
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_service.h"
#include "components/version_info/channel.h"
diff --git a/chrome/browser/ash/bruschetta/bruschetta_service.cc b/chrome/browser/ash/bruschetta/bruschetta_service.cc
index 3c11084e..2f61c66 100644
--- a/chrome/browser/ash/bruschetta/bruschetta_service.cc
+++ b/chrome/browser/ash/bruschetta/bruschetta_service.cc
@@ -24,8 +24,8 @@
#include "chrome/browser/ash/guest_os/public/guest_os_service.h"
#include "chrome/browser/ash/guest_os/public/types.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/dbus/dlcservice/dlcservice_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_service.h"
#include "third_party/cros_system_api/dbus/dlcservice/dbus-constants.h"
diff --git a/chrome/browser/ash/child_accounts/family_user_device_metrics.cc b/chrome/browser/ash/child_accounts/family_user_device_metrics.cc
index a12d691..06ce5b63 100644
--- a/chrome/browser/ash/child_accounts/family_user_device_metrics.cc
+++ b/chrome/browser/ash/child_accounts/family_user_device_metrics.cc
@@ -8,7 +8,7 @@
#include "base/check.h"
#include "base/metrics/histogram_functions.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "components/account_id/account_id.h"
diff --git a/chrome/browser/ash/crosapi/content_protection_ash.cc b/chrome/browser/ash/crosapi/content_protection_ash.cc
index 39ac2cd..77c31f5 100644
--- a/chrome/browser/ash/crosapi/content_protection_ash.cc
+++ b/chrome/browser/ash/crosapi/content_protection_ash.cc
@@ -6,8 +6,8 @@
#include "ash/display/output_protection_delegate.h"
#include "chrome/browser/ash/crosapi/window_util.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/cryptohome/system_salt_getter.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ash/crosapi/crosapi_util.cc b/chrome/browser/ash/crosapi/crosapi_util.cc
index 8208298..e918a50 100644
--- a/chrome/browser/ash/crosapi/crosapi_util.cc
+++ b/chrome/browser/ash/crosapi/crosapi_util.cc
@@ -31,7 +31,6 @@
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/handlers/device_name_policy_handler.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
@@ -47,6 +46,7 @@
#include "chromeos/ash/components/browser_context_helper/browser_context_helper.h"
#include "chromeos/ash/components/browser_context_helper/browser_context_types.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "chromeos/ash/components/system/statistics_provider.h"
diff --git a/chrome/browser/ash/crosapi/echo_private_ash.cc b/chrome/browser/ash/crosapi/echo_private_ash.cc
index 04b29df1..8d57165 100644
--- a/chrome/browser/ash/crosapi/echo_private_ash.cc
+++ b/chrome/browser/ash/crosapi/echo_private_ash.cc
@@ -16,11 +16,11 @@
#include "base/time/time.h"
#include "chrome/browser/ash/crosapi/window_util.h"
#include "chrome/browser/ash/notifications/echo_dialog_view.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_navigator_params.h"
#include "chrome/common/url_constants.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
#include "ui/base/page_transition_types.h"
diff --git a/chrome/browser/ash/crosapi/extension_info_private_ash.cc b/chrome/browser/ash/crosapi/extension_info_private_ash.cc
index 42fa341..8038336 100644
--- a/chrome/browser/ash/crosapi/extension_info_private_ash.cc
+++ b/chrome/browser/ash/crosapi/extension_info_private_ash.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/ash/login/startup_utils.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
@@ -30,6 +29,7 @@
#include "chromeos/ash/components/network/device_state.h"
#include "chromeos/ash/components/network/network_handler.h"
#include "chromeos/ash/components/network/network_state_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "chromeos/constants/devicetype.h"
diff --git a/chrome/browser/ash/crosapi/prefs_ash.cc b/chrome/browser/ash/crosapi/prefs_ash.cc
index 58dbee4..ab02e9ea 100644
--- a/chrome/browser/ash/crosapi/prefs_ash.cc
+++ b/chrome/browser/ash/crosapi/prefs_ash.cc
@@ -13,11 +13,11 @@
#include "base/containers/fixed_flat_map.h"
#include "base/functional/bind.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/lifetime/termination_notification.h"
#include "chrome/browser/media/router/discovery/access_code/access_code_cast_feature.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "chromeos/crosapi/mojom/prefs.mojom.h"
#include "components/content_settings/core/common/pref_names.h"
diff --git a/chrome/browser/ash/crosapi/prefs_ash_unittest.cc b/chrome/browser/ash/crosapi/prefs_ash_unittest.cc
index 59c186e..5c0f1c13 100644
--- a/chrome/browser/ash/crosapi/prefs_ash_unittest.cc
+++ b/chrome/browser/ash/crosapi/prefs_ash_unittest.cc
@@ -10,13 +10,13 @@
#include "ash/constants/ash_pref_names.h"
#include "base/functional/callback_helpers.h"
#include "base/test/bind.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
diff --git a/chrome/browser/ash/crostini/crostini_features.cc b/chrome/browser/ash/crostini/crostini_features.cc
index fdded61b..648988d2 100644
--- a/chrome/browser/ash/crostini/crostini_features.cc
+++ b/chrome/browser/ash/crostini/crostini_features.cc
@@ -11,12 +11,12 @@
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/user.h"
diff --git a/chrome/browser/ash/crostini/crostini_low_disk_notification.cc b/chrome/browser/ash/crostini/crostini_low_disk_notification.cc
index ee2b951..978a1d6 100644
--- a/chrome/browser/ash/crostini/crostini_low_disk_notification.cc
+++ b/chrome/browser/ash/crostini/crostini_low_disk_notification.cc
@@ -12,11 +12,11 @@
#include "base/functional/bind.h"
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/ash/crostini/crostini_util.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/notifications/system_notification_helper.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/settings_window_manager_chromeos.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/user_manager/user_manager.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ash/dbus/chrome_features_service_provider.cc b/chrome/browser/ash/dbus/chrome_features_service_provider.cc
index a9ca4e1..1bc7b0b 100644
--- a/chrome/browser/ash/dbus/chrome_features_service_provider.cc
+++ b/chrome/browser/ash/dbus/chrome_features_service_provider.cc
@@ -20,11 +20,11 @@
#include "chrome/browser/ash/crostini/crostini_pref_names.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_features.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_features.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_service.h"
#include "dbus/bus.h"
diff --git a/chrome/browser/ash/device_name/device_name_store_impl_unittest.cc b/chrome/browser/ash/device_name/device_name_store_impl_unittest.cc
index ee45837..8dc4982 100644
--- a/chrome/browser/ash/device_name/device_name_store_impl_unittest.cc
+++ b/chrome/browser/ash/device_name/device_name_store_impl_unittest.cc
@@ -15,12 +15,12 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/handlers/fake_device_name_policy_handler.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/testing_pref_service.h"
#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ash/display/quirks_manager_delegate_impl.cc b/chrome/browser/ash/display/quirks_manager_delegate_impl.cc
index a2fd836..40f3665 100644
--- a/chrome/browser/ash/display/quirks_manager_delegate_impl.cc
+++ b/chrome/browser/ash/display/quirks_manager_delegate_impl.cc
@@ -7,8 +7,8 @@
#include "ash/constants/ash_paths.h"
#include "base/path_service.h"
#include "base/system/sys_info.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/common/chrome_paths.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "google_apis/google_api_keys.h"
namespace {
diff --git a/chrome/browser/ash/extended_updates/extended_updates_controller.cc b/chrome/browser/ash/extended_updates/extended_updates_controller.cc
index 3c722f3..09312d93 100644
--- a/chrome/browser/ash/extended_updates/extended_updates_controller.cc
+++ b/chrome/browser/ash/extended_updates/extended_updates_controller.cc
@@ -7,7 +7,7 @@
#include "ash/constants/ash_features.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/ownership/owner_settings_service.h"
diff --git a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
index 5dec498..1497cca 100644
--- a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
@@ -126,7 +126,6 @@
#include "chrome/browser/ash/printing/cups_printers_manager.h"
#include "chrome/browser/ash/printing/cups_printers_manager_factory.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/ash/system_web_apps/system_web_app_manager.h"
@@ -167,6 +166,7 @@
#include "chromeos/ash/components/dbus/dbus_thread_manager.h"
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/ash/components/metrics/login_event_recorder.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/services/assistant/assistant_manager_service_impl.h"
#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
diff --git a/chrome/browser/ash/extensions/external_cache_impl.cc b/chrome/browser/ash/extensions/external_cache_impl.cc
index 415d6fd..2a3d67c 100644
--- a/chrome/browser/ash/extensions/external_cache_impl.cc
+++ b/chrome/browser/ash/extensions/external_cache_impl.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ash/extensions/external_cache_impl.h"
#include <stddef.h>
+
#include <utility>
#include "base/files/file_util.h"
@@ -20,7 +21,6 @@
#include "base/values.h"
#include "base/version.h"
#include "chrome/browser/ash/extensions/external_cache_delegate.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/external_provider_impl.h"
@@ -28,6 +28,7 @@
#include "chrome/browser/extensions/install_tracker.h"
#include "chrome/browser/extensions/updater/chrome_extension_downloader_factory.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/extensions/users_private/users_private_api.cc b/chrome/browser/ash/extensions/users_private/users_private_api.cc
index aa52d59..1c1fdeb 100644
--- a/chrome/browser/ash/extensions/users_private/users_private_api.cc
+++ b/chrome/browser/ash/extensions/users_private/users_private_api.cc
@@ -19,11 +19,11 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/users_private.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/session_manager/core/session_manager.h"
#include "components/user_manager/user.h"
diff --git a/chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.cc b/chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.cc
index 136a943..9876b5a2 100644
--- a/chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.cc
+++ b/chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ash/guest_os/virtual_machines/virtual_machines_util.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
namespace virtual_machines {
diff --git a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc
index fb79be08..d6269b2 100644
--- a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc
+++ b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc
@@ -22,13 +22,13 @@
#include "base/task/thread_pool.h"
#include "base/trace_event/trace_event.h"
#include "build/branding_buildflags.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/grit/browser_resources.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/constants/chromeos_features.h"
#include "chromeos/ime/input_methods.h"
diff --git a/chrome/browser/ash/login/auth/chrome_login_performer.cc b/chrome/browser/ash/login/auth/chrome_login_performer.cc
index 3e35c99..948c378 100644
--- a/chrome/browser/ash/login/auth/chrome_login_performer.cc
+++ b/chrome/browser/ash/login/auth/chrome_login_performer.cc
@@ -17,13 +17,13 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/common/chrome_paths.h"
#include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h"
#include "chromeos/ash/components/early_prefs/early_prefs_reader.h"
#include "chromeos/ash/components/osauth/impl/early_login_auth_policy_connector.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/signin/public/identity_manager/account_managed_status_finder.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/chrome/browser/ash/login/auth/chrome_safe_mode_delegate.cc b/chrome/browser/ash/login/auth/chrome_safe_mode_delegate.cc
index 5de3af7..4e57b73 100644
--- a/chrome/browser/ash/login/auth/chrome_safe_mode_delegate.cc
+++ b/chrome/browser/ash/login/auth/chrome_safe_mode_delegate.cc
@@ -6,8 +6,8 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/login/login_state/login_state.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace ash {
diff --git a/chrome/browser/ash/login/existing_user_controller.cc b/chrome/browser/ash/login/existing_user_controller.cc
index 172679b..f86b92e 100644
--- a/chrome/browser/ash/login/existing_user_controller.cc
+++ b/chrome/browser/ash/login/existing_user_controller.cc
@@ -67,7 +67,6 @@
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
@@ -101,6 +100,7 @@
#include "chromeos/ash/components/login/auth/public/key.h"
#include "chromeos/ash/components/login/session/session_termination_manager.h"
#include "chromeos/ash/components/osauth/public/auth_hub.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/strings/grit/chromeos_strings.h"
diff --git a/chrome/browser/ash/login/existing_user_controller_auto_login_unittest.cc b/chrome/browser/ash/login/existing_user_controller_auto_login_unittest.cc
index a93253a..c60224f 100644
--- a/chrome/browser/ash/login/existing_user_controller_auto_login_unittest.cc
+++ b/chrome/browser/ash/login/existing_user_controller_auto_login_unittest.cc
@@ -12,13 +12,13 @@
#include "chrome/browser/ash/login/ui/mock_login_display_host.h"
#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
#include "chromeos/ash/components/login/auth/auth_events_recorder.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/ownership/mock_owner_key_util.h"
#include "components/session_manager/core/session_manager.h"
diff --git a/chrome/browser/ash/login/existing_user_controller_browsertest.cc b/chrome/browser/ash/login/existing_user_controller_browsertest.cc
index 8f8e0f2..97eb3232 100644
--- a/chrome/browser/ash/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/ash/login/existing_user_controller_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ash/login/existing_user_controller.h"
+
#include <string>
#include <vector>
@@ -25,7 +27,6 @@
#include "chrome/browser/ash/app_list/arc/arc_app_list_prefs_factory.h"
#include "chrome/browser/ash/arc/arc_util.h"
#include "chrome/browser/ash/arc/session/arc_session_manager.h"
-#include "chrome/browser/ash/login/existing_user_controller.h"
#include "chrome/browser/ash/login/help_app_launcher.h"
#include "chrome/browser/ash/login/helper.h"
#include "chrome/browser/ash/login/lock/screen_locker_tester.h"
@@ -49,7 +50,6 @@
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -68,6 +68,7 @@
#include "chromeos/ash/components/login/auth/public/user_context.h"
#include "chromeos/ash/components/login/auth/stub_authenticator_builder.h"
#include "chromeos/ash/components/network/network_state_test_helper.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "chromeos/dbus/power/fake_power_manager_client.h"
diff --git a/chrome/browser/ash/login/lock/online_reauth/lock_screen_reauth_manager.cc b/chrome/browser/ash/login/lock/online_reauth/lock_screen_reauth_manager.cc
index 2abcc2e..c733b65 100644
--- a/chrome/browser/ash/login/lock/online_reauth/lock_screen_reauth_manager.cc
+++ b/chrome/browser/ash/login/lock/online_reauth/lock_screen_reauth_manager.cc
@@ -18,7 +18,6 @@
#include "chrome/browser/ash/login/reauth_stats.h"
#include "chrome/browser/ash/login/saml/in_session_password_sync_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.h"
#include "chromeos/ash/components/login/auth/auth_session_authenticator.h"
@@ -26,6 +25,7 @@
#include "chromeos/ash/components/login/auth/public/authentication_error.h"
#include "chromeos/ash/components/login/auth/public/user_context.h"
#include "chromeos/ash/components/proximity_auth/screenlock_bridge.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/pref_service.h"
#include "components/session_manager/core/session_manager.h"
#include "components/user_manager/known_user.h"
diff --git a/chrome/browser/ash/login/lock_screen_utils.cc b/chrome/browser/ash/login/lock_screen_utils.cc
index b3e919bd..72cf229 100644
--- a/chrome/browser/ash/login/lock_screen_utils.cc
+++ b/chrome/browser/ash/login/lock_screen_utils.cc
@@ -10,11 +10,11 @@
#include "base/time/time.h"
#include "chrome/browser/ash/login/login_pref_names.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/ime_controller_client_impl.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/prefs/scoped_user_pref_update.h"
#include "components/user_manager/known_user.h"
diff --git a/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc b/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc
index f5aff690..e3c0c3b 100644
--- a/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc
+++ b/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc
@@ -11,12 +11,12 @@
#include "base/logging.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/net/system_network_context_manager.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/policy/core/common/cloud/device_management_service.h"
#include "components/policy/core/common/cloud/dm_auth.h"
diff --git a/chrome/browser/ash/login/saml/saml_browsertest.cc b/chrome/browser/ash/login/saml/saml_browsertest.cc
index bcc42e0..215d278 100644
--- a/chrome/browser/ash/login/saml/saml_browsertest.cc
+++ b/chrome/browser/ash/login/saml/saml_browsertest.cc
@@ -50,7 +50,6 @@
#include "chrome/browser/ash/policy/core/device_policy_cros_test_helper.h"
#include "chrome/browser/ash/policy/test_support/embedded_policy_test_server_mixin.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
#include "chrome/browser/browser_process.h"
@@ -80,6 +79,7 @@
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
#include "chromeos/ash/components/login/auth/public/key.h"
#include "chromeos/ash/components/login/auth/public/saml_password_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/account_id/account_id.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
diff --git a/chrome/browser/ash/login/screens/display_size_screen.cc b/chrome/browser/ash/login/screens/display_size_screen.cc
index ecdb286..8f1ea2a 100644
--- a/chrome/browser/ash/login/screens/display_size_screen.cc
+++ b/chrome/browser/ash/login/screens/display_size_screen.cc
@@ -13,11 +13,11 @@
#include "chrome/browser/ash/login/users/chrome_user_manager_util.h"
#include "chrome/browser/ash/login/wizard_context.h"
#include "chrome/browser/ash/login/wizard_controller.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/ash/login/display_size_screen_handler.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "ui/display/display.h"
#include "ui/display/manager/display_manager.h"
diff --git a/chrome/browser/ash/login/screens/error_screen.cc b/chrome/browser/ash/login/screens/error_screen.cc
index 23d320a..3286649 100644
--- a/chrome/browser/ash/login/screens/error_screen.cc
+++ b/chrome/browser/ash/login/screens/error_screen.cc
@@ -25,7 +25,6 @@
#include "chrome/browser/ash/login/ui/login_web_dialog.h"
#include "chrome/browser/ash/login/ui/webui_login_view.h"
#include "chrome/browser/ash/login/wizard_controller.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/ash/connectivity_diagnostics_dialog.h"
@@ -40,6 +39,7 @@
#include "chromeos/ash/components/network/network_connection_handler.h"
#include "chromeos/ash/components/network/network_handler.h"
#include "chromeos/ash/components/network/network_state_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "components/user_manager/user_manager.h"
#include "components/user_manager/user_names.h"
diff --git a/chrome/browser/ash/login/screens/gaia_screen.cc b/chrome/browser/ash/login/screens/gaia_screen.cc
index 85b1081..4c30564f 100644
--- a/chrome/browser/ash/login/screens/gaia_screen.cc
+++ b/chrome/browser/ash/login/screens/gaia_screen.cc
@@ -16,11 +16,11 @@
#include "chrome/browser/ash/login/wizard_context.h"
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/util/managed_browser_utils.h"
#include "chrome/browser/ui/webui/ash/login/gaia_screen_handler.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/services/auth_factor_config/auth_factor_config_utils.h"
#include "components/account_id/account_id.h"
#include "components/user_manager/known_user.h"
diff --git a/chrome/browser/ash/login/screens/offline_login_screen.cc b/chrome/browser/ash/login/screens/offline_login_screen.cc
index f19a8a51..3b9dbbe 100644
--- a/chrome/browser/ash/login/screens/offline_login_screen.cc
+++ b/chrome/browser/ash/login/screens/offline_login_screen.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/ash/login/ui/signin_ui.h"
#include "chrome/browser/ash/login/wizard_context.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/ui/webui/ash/login/offline_login_screen_handler.h"
@@ -25,6 +24,7 @@
#include "chromeos/ash/components/login/auth/public/auth_types.h"
#include "chromeos/ash/components/login/auth/public/key.h"
#include "chromeos/ash/components/login/auth/public/user_context.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/user_manager/known_user.h"
#include "google_apis/gaia/gaia_auth_util.h"
diff --git a/chrome/browser/ash/login/screens/reset_screen.cc b/chrome/browser/ash/login/screens/reset_screen.cc
index 90a8202..b23c400 100644
--- a/chrome/browser/ash/login/screens/reset_screen.cc
+++ b/chrome/browser/ash/login/screens/reset_screen.cc
@@ -19,7 +19,6 @@
#include "build/branding_buildflags.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/policy/enrollment/auto_enrollment_type_checker.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/tpm_firmware_update.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/webui/ash/login/reset_screen_handler.h"
@@ -27,6 +26,7 @@
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/ash/components/dbus/update_engine/update_engine_client.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/ash/login/screens/update_required_screen.cc b/chrome/browser/ash/login/screens/update_required_screen.cc
index 3eed3ed..587160e 100644
--- a/chrome/browser/ash/login/screens/update_required_screen.cc
+++ b/chrome/browser/ash/login/screens/update_required_screen.cc
@@ -18,12 +18,12 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/ui/webui/ash/login/update_required_screen_handler.h"
#include "chromeos/ash/components/network/network_handler.h"
#include "chromeos/ash/components/network/network_state_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ash/login/screens/update_required_screen_unittest.cc b/chrome/browser/ash/login/screens/update_required_screen_unittest.cc
index 514e9d7f..f66aa47 100644
--- a/chrome/browser/ash/login/screens/update_required_screen_unittest.cc
+++ b/chrome/browser/ash/login/screens/update_required_screen_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/ash/login/screens/mock_error_screen.h"
#include "chrome/browser/ash/login/startup_utils.h"
#include "chrome/browser/ash/login/wizard_context.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ui/ash/test_login_screen.h"
#include "chrome/browser/ui/webui/ash/login/fake_update_required_screen_handler.h"
@@ -27,6 +26,7 @@
#include "chromeos/ash/components/network/network_handler_test_helper.h"
#include "chromeos/ash/components/network/portal_detector/mock_network_portal_detector.h"
#include "chromeos/ash/components/network/portal_detector/network_portal_detector.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "content/public/test/browser_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/login/screens/user_allowlist_check_screen.cc b/chrome/browser/ash/login/screens/user_allowlist_check_screen.cc
index c0779ab6..93766c28 100644
--- a/chrome/browser/ash/login/screens/user_allowlist_check_screen.cc
+++ b/chrome/browser/ash/login/screens/user_allowlist_check_screen.cc
@@ -6,9 +6,9 @@
#include "base/memory/weak_ptr.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ui/webui/ash/login/user_allowlist_check_screen_handler.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace ash {
namespace {
diff --git a/chrome/browser/ash/login/screens/user_selection_screen.cc b/chrome/browser/ash/login/screens/user_selection_screen.cc
index 737b5d6..51e9ed0f 100644
--- a/chrome/browser/ash/login/screens/user_selection_screen.cc
+++ b/chrome/browser/ash/login/screens/user_selection_screen.cc
@@ -41,7 +41,6 @@
#include "chrome/browser/ash/login/users/default_user_image/default_user_images.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/system_clock.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
@@ -54,6 +53,7 @@
#include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/proximity_auth/screenlock_bridge.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/dbus/tpm_manager/tpm_manager.pb.h"
#include "chromeos/dbus/tpm_manager/tpm_manager_client.h"
diff --git a/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc b/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc
index 0856628..a5402dd1 100644
--- a/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ash/login/screens/welcome_screen.h"
+
#include <memory>
#include "ash/constants/ash_features.h"
@@ -24,7 +26,6 @@
#include "chrome/browser/ash/accessibility/speech_monitor.h"
#include "chrome/browser/ash/login/login_wizard.h"
#include "chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.h"
-#include "chrome/browser/ash/login/screens/welcome_screen.h"
#include "chrome/browser/ash/login/test/js_checker.h"
#include "chrome/browser/ash/login/test/oobe_base_test.h"
#include "chrome/browser/ash/login/test/oobe_screen_exit_waiter.h"
@@ -33,7 +34,6 @@
#include "chrome/browser/ash/login/test/test_predicate_waiter.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_controller.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
#include "chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.h"
@@ -43,6 +43,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/interactive_test_utils.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/system/fake_statistics_provider.h"
#include "chromeos/constants/chromeos_features.h"
diff --git a/chrome/browser/ash/login/session/user_session_initializer.cc b/chrome/browser/ash/login/session/user_session_initializer.cc
index e7dbf3e1..e884373f 100644
--- a/chrome/browser/ash/login/session/user_session_initializer.cc
+++ b/chrome/browser/ash/login/session/user_session_initializer.cc
@@ -31,7 +31,6 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_manager_factory.h"
#include "chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_ash.h"
#include "chrome/browser/component_updater/crl_set_component_installer.h"
@@ -53,6 +52,7 @@
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/network/network_cert_loader.h"
#include "chromeos/ash/components/peripheral_notification/peripheral_notification_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/live_caption/caption_util.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ash/login/session/user_session_manager.cc b/chrome/browser/ash/login/session/user_session_manager.cc
index d5edfff..ba9a8b7d 100644
--- a/chrome/browser/ash/login/session/user_session_manager.cc
+++ b/chrome/browser/ash/login/session/user_session_manager.cc
@@ -98,7 +98,6 @@
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/profiles/signin_profile_handler.h"
#include "chrome/browser/ash/settings/about_flags.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/system_web_apps/apps/help_app/help_app_notification_controller.h"
#include "chrome/browser/ash/tether/tether_service.h"
@@ -142,6 +141,7 @@
#include "chromeos/ash/components/login/auth/stub_authenticator_builder.h"
#include "chromeos/ash/components/login/session/session_termination_manager.h"
#include "chromeos/ash/components/network/portal_detector/network_portal_detector.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/tpm/prepare_tpm.h"
#include "chromeos/dbus/tpm_manager/tpm_manager.pb.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_mojo.cc b/chrome/browser/ash/login/ui/login_display_host_mojo.cc
index 4a22029..9ff7f7584 100644
--- a/chrome/browser/ash/login/ui/login_display_host_mojo.cc
+++ b/chrome/browser/ash/login/ui/login_display_host_mojo.cc
@@ -37,7 +37,6 @@
#include "chrome/browser/ash/login/screens/gaia_screen.h"
#include "chrome/browser/ash/login/security_token_session_controller.h"
#include "chrome/browser/ash/login/wizard_controller.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/certificate_provider/certificate_provider_service.h"
#include "chrome/browser/certificate_provider/certificate_provider_service_factory.h"
@@ -62,6 +61,7 @@
#include "chromeos/ash/components/browser_context_helper/browser_context_helper.h"
#include "chromeos/ash/components/login/auth/public/auth_types.h"
#include "chromeos/ash/components/login/auth/public/user_context.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/startup_metric_utils/common/startup_metric_utils.h"
#include "components/user_manager/known_user.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.cc b/chrome/browser/ash/login/ui/login_display_host_webui.cc
index f5bcd573..555b1c683 100644
--- a/chrome/browser/ash/login/ui/login_display_host_webui.cc
+++ b/chrome/browser/ash/login/ui/login_display_host_webui.cc
@@ -49,7 +49,6 @@
#include "chrome/browser/ash/net/delay_network_call.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
#include "chrome/browser/ash/system/input_device_settings.h"
@@ -82,6 +81,7 @@
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/login/login_state/login_state.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
index b0074b9a..1404869 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
@@ -55,7 +55,6 @@
#include "chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h"
#include "chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/browser_process.h"
@@ -81,6 +80,7 @@
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/login/auth/public/authentication_error.h"
#include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/timezone/timezone_resolver.h"
#include "chromeos/components/onc/certificate_scope.h"
diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.h b/chrome/browser/ash/login/users/chrome_user_manager_impl.h
index 29156d5..74414f2 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.h
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.h
@@ -20,12 +20,12 @@
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profile_manager_observer.h"
#include "chrome/browser/profiles/profile_observer.h"
#include "chromeos/ash/components/login/auth/mount_performer.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/user_manager/multi_user/multi_user_sign_in_policy_controller.h"
#include "components/user_manager/user.h"
diff --git a/chrome/browser/ash/login/users/chrome_user_manager_util.cc b/chrome/browser/ash/login/users/chrome_user_manager_util.cc
index 55ff620..2a6ae71 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_util.cc
+++ b/chrome/browser/ash/login/users/chrome_user_manager_util.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/ash/login/users/chrome_user_manager_util.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_provider.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/policy/core/common/policy_map.h"
#include "components/policy/policy_constants.h"
diff --git a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
index 7d1cce0..9798973 100644
--- a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
@@ -18,11 +18,11 @@
#include "chrome/browser/ash/login/users/chrome_user_manager_util.h"
#include "chrome/browser/ash/login/users/default_user_image/default_user_images.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/ash/components/login/login_state/login_state.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/user_manager/fake_user_manager.h"
#include "components/user_manager/fake_user_manager_delegate.h"
#include "components/user_manager/known_user.h"
diff --git a/chrome/browser/ash/login/version_info_updater.cc b/chrome/browser/ash/login/version_info_updater.cc
index 3a61fa17..bb1a2d6d 100644
--- a/chrome/browser/ash/login/version_info_updater.cc
+++ b/chrome/browser/ash/login/version_info_updater.cc
@@ -16,11 +16,11 @@
#include "base/system/sys_info.h"
#include "base/task/thread_pool.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/grit/branded_strings.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "chromeos/strings/grit/chromeos_strings.h"
diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc
index caeae59..2209a6c 100644
--- a/chrome/browser/ash/login/wizard_controller.cc
+++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -135,7 +135,6 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
@@ -235,6 +234,7 @@
#include "chromeos/ash/components/network/network_state.h"
#include "chromeos/ash/components/network/network_state_handler.h"
#include "chromeos/ash/components/osauth/public/auth_session_storage.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
diff --git a/chrome/browser/ash/login/wizard_controller_unittest.cc b/chrome/browser/ash/login/wizard_controller_unittest.cc
index 216d771..7b2ed2f 100644
--- a/chrome/browser/ash/login/wizard_controller_unittest.cc
+++ b/chrome/browser/ash/login/wizard_controller_unittest.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/ash/net/rollback_network_config/fake_rollback_network_config.h"
#include "chrome/browser/ash/net/rollback_network_config/rollback_network_config_service.h"
#include "chrome/browser/ash/profiles/signin_profile_handler.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_cache.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
@@ -57,6 +56,7 @@
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
#include "chromeos/ash/components/login/auth/auth_events_recorder.h"
#include "chromeos/ash/components/network/network_handler_test_helper.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/system/fake_statistics_provider.h"
#include "chromeos/ash/services/network_config/public/cpp/cros_network_config_test_helper.h"
#include "components/prefs/testing_pref_service.h"
diff --git a/chrome/browser/ash/notifications/low_disk_notification.cc b/chrome/browser/ash/notifications/low_disk_notification.cc
index dc5a0888..c5f9d5b 100644
--- a/chrome/browser/ash/notifications/low_disk_notification.cc
+++ b/chrome/browser/ash/notifications/low_disk_notification.cc
@@ -12,7 +12,6 @@
#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/app/vector_icons/vector_icons.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/notifications/system_notification_helper.h"
@@ -21,6 +20,7 @@
#include "chrome/common/webui_url_constants.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/ash/components/dbus/dbus_thread_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/notifications/low_disk_notification_unittest.cc b/chrome/browser/ash/notifications/low_disk_notification_unittest.cc
index 4657e5eb..9f0fd3a 100644
--- a/chrome/browser/ash/notifications/low_disk_notification_unittest.cc
+++ b/chrome/browser/ash/notifications/low_disk_notification_unittest.cc
@@ -11,7 +11,6 @@
#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/notifications/notification_display_service_tester.h"
#include "chrome/browser/notifications/system_notification_helper.h"
#include "chrome/grit/generated_resources.h"
@@ -20,6 +19,7 @@
#include "chrome/test/base/testing_profile_manager.h"
#include "chromeos/ash/components/dbus/dbus_thread_manager.h"
#include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/user_manager/fake_user_manager.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash.cc b/chrome/browser/ash/ownership/owner_settings_service_ash.cc
index e34d4db..b20a417 100644
--- a/chrome/browser/ash/ownership/owner_settings_service_ash.cc
+++ b/chrome/browser/ash/ownership/owner_settings_service_ash.cc
@@ -33,13 +33,13 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/settings/about_flags.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_provider.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/tpm/tpm_token_loader.h"
#include "components/ownership/owner_key_util.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash_factory.cc b/chrome/browser/ash/ownership/owner_settings_service_ash_factory.cc
index e6f2ec4..e81a819 100644
--- a/chrome/browser/ash/ownership/owner_settings_service_ash_factory.cc
+++ b/chrome/browser/ash/ownership/owner_settings_service_ash_factory.cc
@@ -7,10 +7,10 @@
#include "base/path_service.h"
#include "chrome/browser/ash/ownership/fake_owner_settings_service.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/constants/dbus_paths.h"
#include "components/ownership/owner_key_util.h"
#include "components/ownership/owner_key_util_impl.h"
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc b/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc
index d21d7247..5819ce03 100644
--- a/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc
+++ b/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc
@@ -21,7 +21,6 @@
#include "chrome/browser/ash/ownership/owner_key_loader.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/ownership/ownership_histograms.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_provider.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/net/fake_nss_service.h"
@@ -29,6 +28,7 @@
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "crypto/nss_key_util.h"
#include "crypto/signature_verifier.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_features.cc b/chrome/browser/ash/plugin_vm/plugin_vm_features.cc
index 967e1bc..74d51bde 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_features.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_features.cc
@@ -10,10 +10,10 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/user.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.cc b/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.cc
index ff11cf6..30c268c2 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_test_helper.cc
@@ -17,10 +17,10 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_features.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ui/ash/shelf/chrome_shelf_controller.h"
#include "chrome/common/chrome_features.h"
#include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc
index e1b07a0..93b07ca 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc
@@ -20,10 +20,10 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_manager.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_manager_factory.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/shelf/chrome_shelf_controller.h"
#include "chromeos/ash/components/dbus/dlcservice/dlcservice_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/exo/shell_surface_util.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.h b/chrome/browser/ash/plugin_vm/plugin_vm_util.h
index ba1486c..16f29db 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_util.h
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.h
@@ -12,7 +12,7 @@
#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list_types.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/pref_change_registrar.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util_unittest.cc b/chrome/browser/ash/plugin_vm/plugin_vm_util_unittest.cc
index 3078cfc1..f13dc5a 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_util_unittest.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_util_unittest.cc
@@ -7,11 +7,11 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_features.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_test_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc b/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc
index 0cd2ee3..4e6c741 100644
--- a/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc
+++ b/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc
@@ -17,9 +17,9 @@
#include "chrome/browser/ash/policy/affiliation/affiliation_test_helper.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc b/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
index 536a510..18098f7 100644
--- a/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
+++ b/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
@@ -57,7 +57,6 @@
#include "chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor_impl.h"
#include "chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h"
#include "chrome/browser/ash/printing/bulk_printers_calculator_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/policy/device_management_service_configuration.h"
@@ -72,6 +71,7 @@
#include "chromeos/ash/components/network/network_cert_loader.h"
#include "chromeos/ash/components/network/network_handler.h"
#include "chromeos/ash/components/network/onc/onc_certificate_importer_impl.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account.cc b/chrome/browser/ash/policy/core/device_local_account.cc
index b9efd79b..b061b2d4 100644
--- a/chrome/browser/ash/policy/core/device_local_account.cc
+++ b/chrome/browser/ash/policy/core/device_local_account.cc
@@ -16,7 +16,7 @@
#include "base/strings/string_util.h"
#include "base/values.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/account_id/account_id.h"
#include "components/user_manager/user_names.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service.h b/chrome/browser/ash/policy/core/device_local_account_policy_service.h
index 83dbd4e..bd87f8e8 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_service.h
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_service.h
@@ -18,7 +18,7 @@
#include "base/observer_list.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_broker.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/core/common/schema_registry.h"
static_assert(BUILDFLAG(IS_CHROMEOS_ASH), "For ChromeOS ash-chrome only");
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc b/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc
index eb0f6b5..3e79bf1 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc
@@ -25,7 +25,6 @@
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_provider.h"
#include "chrome/browser/ash/policy/invalidation/fake_affiliated_invalidation_service_provider.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/cros_settings_holder.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/extensions/external_provider_impl.h"
@@ -33,6 +32,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/power/power_policy_controller.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_unittest.cc b/chrome/browser/ash/policy/core/device_local_account_unittest.cc
index e0ea265..96d0f64 100644
--- a/chrome/browser/ash/policy/core/device_local_account_unittest.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_unittest.cc
@@ -7,9 +7,9 @@
#include <utility>
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/policy/core/device_policy_cros_test_helper.cc b/chrome/browser/ash/policy/core/device_policy_cros_test_helper.cc
index 61451ad..4ee4470 100644
--- a/chrome/browser/ash/policy/core/device_policy_cros_test_helper.cc
+++ b/chrome/browser/ash/policy/core/device_policy_cros_test_helper.cc
@@ -16,11 +16,11 @@
#include "base/threading/thread_restrictions.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_ash.h"
#include "chrome/common/chrome_paths.h"
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/constants/dbus_paths.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc b/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc
index 1a68889..b40c4506 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_factory_ash.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/ash/policy/core/user_cloud_policy_store_ash.h"
#include "chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/lifetime/application_lifetime.h"
@@ -34,6 +33,7 @@
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/constants/dbus_paths.h"
#include "components/policy/core/common/cloud/cloud_external_data_manager.h"
#include "components/policy/core/common/cloud/device_management_service.h"
diff --git a/chrome/browser/ash/policy/display/display_resolution_handler.cc b/chrome/browser/ash/policy/display/display_resolution_handler.cc
index 976c014..85d7680 100644
--- a/chrome/browser/ash/policy/display/display_resolution_handler.cc
+++ b/chrome/browser/ash/policy/display/display_resolution_handler.cc
@@ -10,7 +10,7 @@
#include "base/functional/bind.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "mojo/public/cpp/bindings/struct_traits.h"
diff --git a/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc b/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc
index 9cb88e5..b3e651b 100644
--- a/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc
+++ b/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc
@@ -16,11 +16,11 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/policy/core/device_policy_builder.h"
#include "chrome/browser/ash/policy/display/device_display_cros_browser_test.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ash/policy/display/display_settings_handler.h b/chrome/browser/ash/policy/display/display_settings_handler.h
index 7ec6800..c1dfaaa 100644
--- a/chrome/browser/ash/policy/display/display_settings_handler.h
+++ b/chrome/browser/ash/policy/display/display_settings_handler.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/crosapi/mojom/cros_display_config.mojom.h"
#include "mojo/public/cpp/bindings/associated_receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h
index 1d8c57aa..60749114 100644
--- a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h
@@ -14,7 +14,7 @@
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/core/common/policy_map.h"
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
index d3b9464..ee6e59fe 100644
--- a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
@@ -25,7 +25,6 @@
#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h"
#include "chrome/browser/ash/policy/invalidation/fake_affiliated_invalidation_service_provider.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/cros_settings_holder.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/profiles/profile.h"
@@ -34,6 +33,7 @@
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
#include "components/policy/core/common/cloud/mock_cloud_external_data_manager.h"
diff --git a/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
index e5117e0..2fb97b0 100644
--- a/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
@@ -7,8 +7,8 @@
#include "chrome/browser/ash/crostini/crostini_pref_names.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/policy_constants.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/policy/external_data/handlers/preconfigured_desk_templates_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/preconfigured_desk_templates_external_data_handler.cc
index 165c6e1..db34e89 100644
--- a/chrome/browser/ash/policy/external_data/handlers/preconfigured_desk_templates_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/preconfigured_desk_templates_external_data_handler.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ui/ash/desks/desks_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/policy_constants.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.cc
index 414c6a7..69bd9b6 100644
--- a/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.cc
@@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/printing/print_servers_provider.h"
#include "chrome/browser/ash/printing/print_servers_provider_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/policy_constants.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.cc
index 3b4dd2f..97561a4e 100644
--- a/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.cc
@@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/printing/bulk_printers_calculator.h"
#include "chrome/browser/ash/printing/bulk_printers_calculator_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/policy_constants.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.cc
index eb25e888..6c8c440 100644
--- a/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/ash/login/users/avatar/user_image_manager.h"
#include "chrome/browser/ash/login/users/avatar/user_image_manager_registry.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/policy_constants.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.cc
index edaf268..0c6f5dd 100644
--- a/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/policy_constants.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h
index 69445a2..dfb71e8fd 100644
--- a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h
@@ -12,7 +12,7 @@
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
#include "chrome/browser/ash/notifications/adb_sideloading_policy_change_notification.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/dbus/power_manager/idle.pb.h"
diff --git a/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h b/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h
index 181608f..d4775e3f 100644
--- a/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h
@@ -8,7 +8,7 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "device/bluetooth/bluetooth_adapter.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.cc b/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.cc
index 599fd38..eac146c 100644
--- a/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.cc
+++ b/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.cc
@@ -18,7 +18,7 @@
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.h b/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.h
index 38baf9a9..9fda81f 100644
--- a/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.h
@@ -11,8 +11,8 @@
#include "base/callback_list.h"
#include "base/memory/raw_ptr.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/dbus/dlcservice/dlcservice_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "third_party/protobuf/src/google/protobuf/repeated_ptr_field.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h
index 39928af4..31a701f 100644
--- a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h
+++ b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h
@@ -7,7 +7,7 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace ash {
class NetworkDeviceHandler;
diff --git a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler_unittest.cc b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler_unittest.cc
index 6cfdee4..a572576 100644
--- a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler_unittest.cc
+++ b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler_unittest.cc
@@ -8,10 +8,10 @@
#include <string>
#include <tuple>
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
#include "chromeos/ash/components/network/mock_network_device_handler.h"
#include "chromeos/ash/components/network/network_device_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h b/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h
index 96f9986..0b735bc 100644
--- a/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h
+++ b/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h
@@ -12,8 +12,8 @@
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
#include "chrome/browser/ash/policy/handlers/device_name_policy_handler.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/network/network_state_handler_observer.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/system/statistics_provider.h"
namespace ash {
diff --git a/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc b/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc
index 50c0d57..76cfcb0 100644
--- a/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc
+++ b/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc
@@ -6,7 +6,7 @@
#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "components/quirks/quirks_manager.h"
#include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc
index 8d94ddf..1c834cc6 100644
--- a/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc
+++ b/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc
@@ -11,11 +11,11 @@
#include "base/task/single_thread_task_runner.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/system_clock.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "content/public/test/browser_test.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h b/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h
index 094a2a73..df0b9de 100644
--- a/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h
+++ b/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.h
@@ -7,7 +7,7 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc
index f6a0ced..3d3756f 100644
--- a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc
+++ b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc
@@ -11,11 +11,11 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_manager.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_manager_factory.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chromeos/ash/components/cryptohome/cryptohome_parameters.h"
#include "chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h"
#include "chromeos/ash/components/login/session/session_termination_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
diff --git a/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h b/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h
index 4cc7538d..7173574a 100644
--- a/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h
@@ -14,10 +14,10 @@
#include "base/time/time.h"
#include "base/timer/wall_clock_timer.h"
#include "base/version.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/upgrade_detector/build_state_observer.h"
#include "chromeos/ash/components/dbus/update_engine/update_engine_client.h"
#include "chromeos/ash/components/network/network_state_handler_observer.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
class PrefRegistrySimple;
diff --git a/chrome/browser/ash/policy/handlers/system_proxy_handler.cc b/chrome/browser/ash/policy/handlers/system_proxy_handler.cc
index 14eaccb..899598f 100644
--- a/chrome/browser/ash/policy/handlers/system_proxy_handler.cc
+++ b/chrome/browser/ash/policy/handlers/system_proxy_handler.cc
@@ -9,8 +9,8 @@
#include "base/functional/bind.h"
#include "base/values.h"
#include "chrome/browser/ash/net/system_proxy_manager.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/network/network_event_log.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
diff --git a/chrome/browser/ash/policy/handlers/system_proxy_handler.h b/chrome/browser/ash/policy/handlers/system_proxy_handler.h
index 909a36e..0c23793 100644
--- a/chrome/browser/ash/policy/handlers/system_proxy_handler.h
+++ b/chrome/browser/ash/policy/handlers/system_proxy_handler.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_ASH_POLICY_HANDLERS_SYSTEM_PROXY_HANDLER_H_
#include "base/memory/raw_ptr.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace ash {
class SystemProxyManager;
diff --git a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h
index afe0a6bf..bcb7727 100644
--- a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.h
@@ -10,7 +10,7 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/notifications/tpm_auto_update_notification.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
class PrefRegistrySimple;
class PrefService;
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc
index 58179aed9..cf3c3f5 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc
+++ b/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc
@@ -36,7 +36,6 @@
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "chrome/browser/ash/policy/uploading/system_log_uploader.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_ash.h"
#include "chrome/browser/policy/messaging_layer/proto/synced/log_upload_event.pb.h"
@@ -47,6 +46,7 @@
#include "chrome/browser/support_tool/support_tool_util.h"
#include "chrome/browser/ui/webui/support_tool/support_tool_ui_utils.h"
#include "chromeos/ash/components/browser_context_helper/browser_context_helper.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/components/kiosk/kiosk_utils.h"
#include "components/feedback/redaction_tool/pii_types.h"
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.cc
index fc10cbe..3aa76b4 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.cc
@@ -6,7 +6,7 @@
#include "base/notreached.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
namespace reporting {
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/kiosk_heartbeat/kiosk_heartbeat_telemetry_events_browsertest.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/kiosk_heartbeat/kiosk_heartbeat_telemetry_events_browsertest.cc
index dff2eb8..0daa186a 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/kiosk_heartbeat/kiosk_heartbeat_telemetry_events_browsertest.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/kiosk_heartbeat/kiosk_heartbeat_telemetry_events_browsertest.cc
@@ -12,7 +12,6 @@
#include "chrome/browser/ash/policy/affiliation/affiliation_test_helper.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
#include "chrome/browser/browser_process.h"
@@ -20,6 +19,7 @@
#include "chrome/browser/policy/dm_token_utils.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/constants/chromeos_features.h"
#include "chromeos/dbus/missive/missive_client_test_observer.h"
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_prefs.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_prefs.cc
index ddd817b3..47626cf5 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_prefs.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_prefs.cc
@@ -8,8 +8,8 @@
#include "base/containers/contains.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/chromeos/reporting/metric_default_utils.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/reporting/metrics/reporting_settings.h"
#include "components/services/app_service/public/cpp/app_types.h"
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_telemetry_sampler_browsertest.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_telemetry_sampler_browsertest.cc
index dc6a674..0d049c2 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_telemetry_sampler_browsertest.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_telemetry_sampler_browsertest.cc
@@ -17,10 +17,10 @@
#include "chrome/browser/ash/policy/affiliation/affiliation_mixin.h"
#include "chrome/browser/ash/policy/affiliation/affiliation_test_helper.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/chromeos/reporting/metric_default_utils.h"
#include "chromeos/ash/components/network/network_handler_test_helper.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/services/cros_healthd/public/cpp/fake_cros_healthd.h"
#include "chromeos/ash/services/cros_healthd/public/mojom/cros_healthd_probe.mojom.h"
diff --git a/chrome/browser/ash/policy/reporting/user_event_reporter_helper.cc b/chrome/browser/ash/policy/reporting/user_event_reporter_helper.cc
index 076e09b..f929ae0 100644
--- a/chrome/browser/ash/policy/reporting/user_event_reporter_helper.cc
+++ b/chrome/browser/ash/policy/reporting/user_event_reporter_helper.cc
@@ -11,9 +11,9 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/core/reporting_user_tracker.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_ash.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/reporting/client/report_queue_factory.h"
#include "components/reporting/proto/synced/record.pb.h"
#include "components/reporting/util/status.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h
index 198031e..91a3e2e 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h
+++ b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h
@@ -14,7 +14,7 @@
#include "chrome/browser/ash/policy/scheduled_task_handler/reboot_notifications_scheduler.h"
#include "chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h"
#include "chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "services/device/public/mojom/wake_lock.mojom-forward.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h
index c9fe6e8..6ce2c06 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h
+++ b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h
@@ -14,8 +14,8 @@
#include "chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h"
#include "chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h"
#include "chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/network/network_state_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
#include "services/device/public/mojom/wake_lock.mojom-forward.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
diff --git a/chrome/browser/ash/policy/status_collector/child_status_collector.cc b/chrome/browser/ash/policy/status_collector/child_status_collector.cc
index 664ee90..511309d 100644
--- a/chrome/browser/ash/policy/status_collector/child_status_collector.cc
+++ b/chrome/browser/ash/policy/status_collector/child_status_collector.cc
@@ -34,11 +34,11 @@
#include "chrome/browser/ash/policy/status_collector/child_activity_storage.h"
#include "chrome/browser/ash/policy/status_collector/interval_map.h"
#include "chrome/browser/ash/policy/status_collector/status_collector_state.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "chromeos/ash/components/login/login_state/login_state.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
#include "chromeos/ash/components/system/statistics_provider.h"
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector.cc b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
index 3c66b68..575a1bf 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector.cc
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
@@ -62,7 +62,6 @@
#include "chrome/browser/ash/policy/status_collector/status_collector_state.h"
#include "chrome/browser/ash/policy/status_collector/tpm_status_combiner.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/crash_upload_list/crash_upload_list.h"
#include "chrome/browser/policy/profile_policy_connector.h"
@@ -83,6 +82,7 @@
#include "chromeos/ash/components/network/network_handler.h"
#include "chromeos/ash/components/network/network_state.h"
#include "chromeos/ash/components/network/network_state_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
#include "chromeos/ash/components/system/statistics_provider.h"
diff --git a/chrome/browser/ash/policy/status_collector/status_collector.h b/chrome/browser/ash/policy/status_collector/status_collector.h
index bdc20a99..55bdb045 100644
--- a/chrome/browser/ash/policy/status_collector/status_collector.h
+++ b/chrome/browser/ash/policy/status_collector/status_collector.h
@@ -16,7 +16,7 @@
#include "base/time/clock.h"
#include "base/time/default_clock.h"
#include "base/time/time.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/proto/device_management_backend.pb.h"
class PrefRegistrySimple;
diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h
index 5e2ed058..f6d01491 100644
--- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h
+++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.h
@@ -15,7 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/gcm_driver/gcm_app_handler.h"
#include "components/gcm_driver/gcm_client.h"
#include "components/gcm_driver/gcm_connection_observer.h"
diff --git a/chrome/browser/ash/policy/uploading/system_log_uploader.h b/chrome/browser/ash/policy/uploading/system_log_uploader.h
index eb19563..cb83ddf 100644
--- a/chrome/browser/ash/policy/uploading/system_log_uploader.h
+++ b/chrome/browser/ash/policy/uploading/system_log_uploader.h
@@ -19,7 +19,7 @@
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
#include "chrome/browser/ash/policy/uploading/upload_job.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/core/common/remote_commands/remote_command_job.h"
namespace base {
diff --git a/chrome/browser/ash/preferences.cc b/chrome/browser/ash/preferences.cc
index ba26d2e..a8d61b7f 100644
--- a/chrome/browser/ash/preferences.cc
+++ b/chrome/browser/ash/preferences.cc
@@ -43,7 +43,6 @@
#include "chrome/browser/ash/login/login_pref_names.h"
#include "chrome/browser/ash/login/session/user_session_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
#include "chrome/browser/ash/system/timezone_util.h"
@@ -59,6 +58,7 @@
#include "chromeos/ash/components/dbus/update_engine/update_engine_client.h"
#include "chromeos/ash/components/geolocation/simple_geolocation_provider.h"
#include "chromeos/ash/components/peripheral_notification/peripheral_notification_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/standalone_browser/lacros_availability.h"
#include "chromeos/ash/components/system/statistics_provider.h"
diff --git a/chrome/browser/ash/preferences_browsertest.cc b/chrome/browser/ash/preferences_browsertest.cc
index aff0fab..038563b 100644
--- a/chrome/browser/ash/preferences_browsertest.cc
+++ b/chrome/browser/ash/preferences_browsertest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
#include <sys/types.h>
+
#include <memory>
#include "ash/constants/ash_features.h"
@@ -19,10 +20,10 @@
#include "chrome/browser/ash/login/ui/user_adding_screen.h"
#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/fake_input_device_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ash/printing/calculators_policies_binder.cc b/chrome/browser/ash/printing/calculators_policies_binder.cc
index 880188f..091766c 100644
--- a/chrome/browser/ash/printing/calculators_policies_binder.cc
+++ b/chrome/browser/ash/printing/calculators_policies_binder.cc
@@ -13,9 +13,9 @@
#include "base/memory/raw_ptr.h"
#include "chrome/browser/ash/printing/bulk_printers_calculator.h"
#include "chrome/browser/ash/printing/bulk_printers_calculator_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/ash/printing/calculators_policies_binder_unittest.cc b/chrome/browser/ash/printing/calculators_policies_binder_unittest.cc
index ff1135d..35ae23d 100644
--- a/chrome/browser/ash/printing/calculators_policies_binder_unittest.cc
+++ b/chrome/browser/ash/printing/calculators_policies_binder_unittest.cc
@@ -9,10 +9,10 @@
#include "base/test/task_environment.h"
#include "chrome/browser/ash/printing/bulk_printers_calculator.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/printing/printer_configuration.h"
#include "components/prefs/testing_pref_service.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/printing/cups_printers_manager.cc b/chrome/browser/ash/printing/cups_printers_manager.cc
index c6a5d02..2e41d5c 100644
--- a/chrome/browser/ash/printing/cups_printers_manager.cc
+++ b/chrome/browser/ash/printing/cups_printers_manager.cc
@@ -41,13 +41,13 @@
#include "chrome/browser/ash/printing/usb_printer_notification_controller.h"
#include "chrome/browser/ash/printing/zeroconf_printer_detector.h"
#include "chrome/browser/ash/scanning/zeroconf_scanner_detector.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/printing/print_preview_sticky_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/pref_names.h"
#include "chromeos/ash/components/dbus/dlcservice/dlcservice_client.h"
#include "chromeos/ash/components/dbus/printscanmgr/printscanmgr_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/printing/cups_printer_status.h"
#include "chromeos/printing/printing_constants.h"
#include "chromeos/printing/uri.h"
diff --git a/chrome/browser/ash/printing/enterprise_printers_provider.cc b/chrome/browser/ash/printing/enterprise_printers_provider.cc
index ec07556..59a2fe4 100644
--- a/chrome/browser/ash/printing/enterprise_printers_provider.cc
+++ b/chrome/browser/ash/printing/enterprise_printers_provider.cc
@@ -18,9 +18,9 @@
#include "chrome/browser/ash/printing/bulk_printers_calculator_factory.h"
#include "chrome/browser/ash/printing/calculators_policies_binder.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/printing/printer_configuration.h"
#include "chromeos/printing/printer_translator.h"
#include "components/device_event_log/device_event_log.h"
diff --git a/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc b/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc
index f8ae5df1..55b22cc 100644
--- a/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc
+++ b/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc
@@ -19,9 +19,9 @@
#include "chrome/browser/ash/printing/bulk_printers_calculator.h"
#include "chrome/browser/ash/printing/bulk_printers_calculator_factory.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/printing/printer_configuration.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
diff --git a/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc b/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc
index cc2f8a3..b50c4f42 100644
--- a/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc
+++ b/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/raw_ptr.h"
-#include "chrome/browser/ash/printing/history/print_job_reporting_service.h"
-
#include <memory>
#include <utility>
@@ -13,13 +10,15 @@
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/logging.h"
+#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
#include "chrome/browser/ash/printing/history/print_job_info.pb.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chrome/browser/ash/printing/history/print_job_reporting_service.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "components/reporting/client/report_queue.h"
diff --git a/chrome/browser/ash/printing/ipp_client_info_calculator.cc b/chrome/browser/ash/printing/ipp_client_info_calculator.cc
index 74478e4..05c477c 100644
--- a/chrome/browser/ash/printing/ipp_client_info_calculator.cc
+++ b/chrome/browser/ash/printing/ipp_client_info_calculator.cc
@@ -15,7 +15,7 @@
#include "base/system/sys_info.h"
#include "chrome/browser/ash/policy/core/device_attributes.h"
#include "chrome/browser/ash/policy/core/device_attributes_impl.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/version_info/version_info.h"
#include "printing/mojom/print.mojom.h"
diff --git a/chrome/browser/ash/report_controller_initializer.cc b/chrome/browser/ash/report_controller_initializer.cc
index f54300d..a214f0d 100644
--- a/chrome/browser/ash/report_controller_initializer.cc
+++ b/chrome/browser/ash/report_controller_initializer.cc
@@ -23,7 +23,6 @@
#include "base/time/time.h"
#include "chrome/browser/ash/login/startup_utils.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_ash.h"
@@ -33,6 +32,7 @@
#include "chromeos/ash/components/report/device_metrics/use_case/real_psm_client_manager.h"
#include "chromeos/ash/components/report/proto/fresnel_service.pb.h"
#include "chromeos/ash/components/report/utils/time_utils.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/chrome/browser/ash/settings/cros_settings.cc b/chrome/browser/ash/settings/cros_settings.cc
deleted file mode 100644
index bebfee6..0000000
--- a/chrome/browser/ash/settings/cros_settings.cc
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright 2012 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ash/settings/cros_settings.h"
-
-#include <stddef.h>
-
-#include <string_view>
-
-#include "ash/constants/ash_switches.h"
-#include "base/check_op.h"
-#include "base/command_line.h"
-#include "base/functional/bind.h"
-#include "base/notreached.h"
-#include "base/ranges/algorithm.h"
-#include "base/strings/string_util.h"
-#include "base/values.h"
-#include "chromeos/ash/components/settings/cros_settings_names.h"
-#include "chromeos/ash/components/settings/system_settings_provider.h"
-#include "google_apis/gaia/gaia_auth_util.h"
-
-namespace ash {
-
-namespace {
-CrosSettings* g_cros_settings = nullptr;
-} // namespace
-
-// static
-bool CrosSettings::IsInitialized() {
- return g_cros_settings;
-}
-
-// static
-CrosSettings* CrosSettings::Get() {
- CHECK(g_cros_settings);
- return g_cros_settings;
-}
-
-// static
-void CrosSettings::SetInstance(CrosSettings* cros_settings) {
- CHECK(!g_cros_settings || !cros_settings);
- g_cros_settings = cros_settings;
-}
-
-CrosSettings::CrosSettings() = default;
-
-CrosSettings::~CrosSettings() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-}
-
-bool CrosSettings::IsCrosSettings(std::string_view path) {
- return base::StartsWith(path, kCrosSettingsPrefix,
- base::CompareCase::SENSITIVE);
-}
-
-const base::Value* CrosSettings::GetPref(std::string_view path) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- CrosSettingsProvider* provider = GetProvider(path);
- if (provider)
- return provider->Get(path);
- NOTREACHED() << path << " preference was not found in the signed settings.";
- return nullptr;
-}
-
-CrosSettingsProvider::TrustedStatus CrosSettings::PrepareTrustedValues(
- base::OnceClosure callback) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- for (size_t i = 0; i < providers_.size(); ++i) {
- CrosSettingsProvider::TrustedStatus status =
- providers_[i]->PrepareTrustedValues(&callback);
- if (status != CrosSettingsProvider::TRUSTED)
- return status;
- }
- return CrosSettingsProvider::TRUSTED;
-}
-
-bool CrosSettings::GetBoolean(std::string_view path, bool* bool_value) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- const base::Value* value = GetPref(path);
- if (value && value->is_bool()) {
- *bool_value = value->GetBool();
- return true;
- }
- return false;
-}
-
-bool CrosSettings::GetInteger(std::string_view path, int* out_value) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- const base::Value* value = GetPref(path);
- if (value && value->is_int()) {
- *out_value = value->GetInt();
- return true;
- }
- return false;
-}
-
-bool CrosSettings::GetDouble(std::string_view path, double* out_value) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- // `GetIfDouble` incapsulates type check.
- std::optional<double> maybe_value = GetPref(path)->GetIfDouble();
- if (maybe_value.has_value()) {
- *out_value = maybe_value.value();
- return true;
- }
- return false;
-}
-
-bool CrosSettings::GetString(std::string_view path,
- std::string* out_value) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- const base::Value* value = GetPref(path);
- if (value && value->is_string()) {
- *out_value = value->GetString();
- return true;
- }
- return false;
-}
-
-bool CrosSettings::GetList(std::string_view path,
- const base::Value::List** out_value) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- const base::Value* value = GetPref(path);
- if (value && value->is_list()) {
- *out_value = &value->GetList();
- return true;
- }
- return false;
-}
-
-bool CrosSettings::GetDictionary(std::string_view path,
- const base::Value::Dict** out_value) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- const base::Value* value = GetPref(path);
- if (value && value->is_dict()) {
- *out_value = &value->GetDict();
- return true;
- }
- return false;
-}
-
-bool CrosSettings::IsUserAllowlisted(
- const std::string& username,
- bool* wildcard_match,
- const std::optional<user_manager::UserType>& user_type) const {
- // Skip allowlist check for tests.
- if (switches::ShouldSkipOobePostLogin()) {
- return true;
- }
-
- bool allow_new_user = false;
- GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
- if (allow_new_user)
- return true;
-
- if (FindEmailInList(kAccountsPrefUsers, username, wildcard_match))
- return true;
-
- bool family_link_allowed = false;
- GetBoolean(kAccountsPrefFamilyLinkAccountsAllowed, &family_link_allowed);
- return family_link_allowed && user_type == user_manager::UserType::kChild;
-}
-
-bool CrosSettings::FindEmailInList(const std::string& path,
- const std::string& email,
- bool* wildcard_match) const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
- const base::Value::List* list;
- if (!GetList(path, &list)) {
- if (wildcard_match)
- *wildcard_match = false;
- return false;
- }
-
- return FindEmailInList(*list, email, wildcard_match);
-}
-
-// static
-bool CrosSettings::FindEmailInList(const base::Value::List& list,
- const std::string& email,
- bool* wildcard_match) {
- std::string canonicalized_email(
- gaia::CanonicalizeEmail(gaia::SanitizeEmail(email)));
- std::string wildcard_email;
- std::string::size_type at_pos = canonicalized_email.find('@');
- if (at_pos != std::string::npos) {
- wildcard_email =
- std::string("*").append(canonicalized_email.substr(at_pos));
- }
-
- if (wildcard_match)
- *wildcard_match = false;
-
- bool found_wildcard_match = false;
- for (const auto& entry : list) {
- if (!entry.is_string()) {
- NOTREACHED();
- continue;
- }
- std::string canonicalized_entry(
- gaia::CanonicalizeEmail(gaia::SanitizeEmail(entry.GetString())));
-
- if (canonicalized_entry != wildcard_email &&
- canonicalized_entry == canonicalized_email) {
- return true;
- }
-
- // If there is a wildcard match, don't exit early. There might be an exact
- // match further down the list that should take precedence if present.
- if (canonicalized_entry == wildcard_email)
- found_wildcard_match = true;
- }
-
- if (wildcard_match)
- *wildcard_match = found_wildcard_match;
-
- return found_wildcard_match;
-}
-
-void CrosSettings::SetSupervisedUserCrosSettingsProvider(
- std::unique_ptr<CrosSettingsProvider> provider) {
- CHECK(!supervised_user_cros_settings_provider_);
- supervised_user_cros_settings_provider_ = provider.get();
- AddSettingsProvider(std::move(provider));
-}
-
-bool CrosSettings::AddSettingsProvider(
- std::unique_ptr<CrosSettingsProvider> provider) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- CrosSettingsProvider* provider_ptr = provider.get();
- providers_.push_back(std::move(provider));
-
- // Allow the provider to notify this object when settings have changed.
- // Providers instantiated inside this class will have the same callback
- // passed to their constructor, but doing it here allows for providers
- // to be instantiated outside this class.
- CrosSettingsProvider::NotifyObserversCallback notify_cb(base::BindRepeating(
- &CrosSettings::FireObservers, base::Unretained(this)));
- provider_ptr->SetNotifyObserversCallback(notify_cb);
- return true;
-}
-
-std::unique_ptr<CrosSettingsProvider> CrosSettings::RemoveSettingsProvider(
- CrosSettingsProvider* provider) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- auto it = base::ranges::find(providers_, provider,
- &std::unique_ptr<CrosSettingsProvider>::get);
- if (it != providers_.end()) {
- std::unique_ptr<CrosSettingsProvider> ptr = std::move(*it);
- providers_.erase(it);
- return ptr;
- }
- return nullptr;
-}
-
-base::CallbackListSubscription CrosSettings::AddSettingsObserver(
- const std::string& path,
- base::RepeatingClosure callback) {
- DCHECK(!path.empty());
- DCHECK(callback);
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(GetProvider(path));
-
- // Get the callback registry associated with the path.
- base::RepeatingClosureList* registry = nullptr;
- auto observer_iterator = settings_observers_.find(path);
- if (observer_iterator == settings_observers_.end()) {
- settings_observers_[path] = std::make_unique<base::RepeatingClosureList>();
- registry = settings_observers_[path].get();
- } else {
- registry = observer_iterator->second.get();
- }
-
- return registry->Add(std::move(callback));
-}
-
-CrosSettingsProvider* CrosSettings::GetProvider(std::string_view path) const {
- for (const auto& provider : providers_) {
- if (provider->HandlesSetting(path)) {
- return provider.get();
- }
- }
- return nullptr;
-}
-
-void CrosSettings::FireObservers(const std::string& path) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- auto observer_iterator = settings_observers_.find(path);
- if (observer_iterator == settings_observers_.end())
- return;
-
- observer_iterator->second->Notify();
-}
-
-} // namespace ash
diff --git a/chrome/browser/ash/settings/cros_settings.h b/chrome/browser/ash/settings/cros_settings.h
deleted file mode 100644
index 17a1128f..0000000
--- a/chrome/browser/ash/settings/cros_settings.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2012 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_ASH_SETTINGS_CROS_SETTINGS_H_
-#define CHROME_BROWSER_ASH_SETTINGS_CROS_SETTINGS_H_
-
-#include <map>
-#include <memory>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include "base/callback_list.h"
-#include "base/functional/callback_forward.h"
-#include "base/memory/raw_ptr.h"
-#include "base/sequence_checker.h"
-#include "base/values.h"
-#include "build/chromeos_buildflags.h"
-#include "chromeos/ash/components/settings/cros_settings_names.h"
-#include "chromeos/ash/components/settings/cros_settings_provider.h"
-#include "components/user_manager/user_type.h"
-
-static_assert(BUILDFLAG(IS_CHROMEOS_ASH), "For ChromeOS ash-chrome only");
-
-namespace ash {
-
-// This class manages per-device/global settings.
-class CrosSettings {
- public:
- // Returns the global singleton instance.
- // Life time is managed by CrosSettingsHolder or, if it is in tests,
- // ScopedTestingCrosSettings.
- static bool IsInitialized();
- static CrosSettings* Get();
-
- // Creates an instance with no providers as yet.
- CrosSettings();
- CrosSettings(const CrosSettings&) = delete;
- CrosSettings& operator=(const CrosSettings&) = delete;
- ~CrosSettings();
-
- // Helper function to test if the given |path| is a valid cros setting.
- static bool IsCrosSettings(std::string_view path);
-
- // Returns setting value for the given |path|.
- const base::Value* GetPref(std::string_view path) const;
-
- // Requests that all providers ensure the values they are serving were read
- // from a trusted store:
- // * If all providers are serving trusted values, returns TRUSTED. This
- // indicates that the cros settings returned by |this| can be trusted during
- // the current loop cycle.
- // * If at least one provider ran into a permanent failure while trying to
- // read values from its trusted store, returns PERMANENTLY_UNTRUSTED. This
- // indicates that the cros settings will never become trusted.
- // * Otherwise, returns TEMPORARILY_UNTRUSTED. This indicates that at least
- // one provider needs to read values from its trusted store first. The
- // |callback| will be called back when the read is done.
- // PrepareTrustedValues() should be called again at that point to determine
- // whether all providers are serving trusted values now.
- CrosSettingsProvider::TrustedStatus PrepareTrustedValues(
- base::OnceClosure callback) const;
-
- // These are convenience forms of Get(). The value will be retrieved
- // and the return value will be true if the |path| is valid and the value at
- // the end of the path can be returned in the form specified.
- bool GetBoolean(std::string_view path, bool* out_value) const;
- bool GetInteger(std::string_view path, int* out_value) const;
- bool GetDouble(std::string_view path, double* out_value) const;
- bool GetString(std::string_view path, std::string* out_value) const;
- bool GetList(std::string_view path,
- const base::Value::List** out_value) const;
- bool GetDictionary(std::string_view path,
- const base::Value::Dict** out_value) const;
-
- // Checks if the given username is on the list of users allowed to sign-in to
- // this device. |wildcard_match| may be nullptr. If it's present, it'll be set
- // to true if the list check was satisfied via a wildcard. In some
- // configurations user can be allowed based on the |user_type|. See
- // |DeviceFamilyLinkAccountsAllowed| policy.
- bool IsUserAllowlisted(
- const std::string& username,
- bool* wildcard_match,
- const std::optional<user_manager::UserType>& user_type) const;
-
- // Helper function for the allowlist op. Implemented here because we will need
- // this in a few places. The functions searches for |email| in the pref |path|
- // It respects allowlists so [email protected] will match *@bar.baz too. If the
- // match was via a wildcard, |wildcard_match| is set to true.
- bool FindEmailInList(const std::string& path,
- const std::string& email,
- bool* wildcard_match) const;
-
- // Same as above, but receives already populated user list.
- static bool FindEmailInList(const base::Value::List& list,
- const std::string& email,
- bool* wildcard_match);
-
- // Sets a special CrosSettingsProvider for child account handling.
- // This can be called at most once per instance.
- void SetSupervisedUserCrosSettingsProvider(
- std::unique_ptr<CrosSettingsProvider> provider);
-
- // Adding/removing of providers.
- bool AddSettingsProvider(std::unique_ptr<CrosSettingsProvider> provider);
- std::unique_ptr<CrosSettingsProvider> RemoveSettingsProvider(
- CrosSettingsProvider* provider);
-
- // Add an observer Callback for changes for the given |path|.
- [[nodiscard]] base::CallbackListSubscription AddSettingsObserver(
- const std::string& path,
- base::RepeatingClosure callback);
-
- // Returns the provider that handles settings with the |path| or prefix.
- CrosSettingsProvider* GetProvider(std::string_view path) const;
-
- // TODO(hidehiko): Consider to migrate this into GetProvider().
- const CrosSettingsProvider* supervised_user_cros_settings_provider() const {
- return supervised_user_cros_settings_provider_;
- }
-
- private:
- friend class CrosSettingsTest;
-
- // Allows accessing to SetInstance.
- friend class CrosSettingsHolder;
- friend class ScopedTestingCrosSettings;
-
- // Sets `cros_settings` as a global instance. This does not take ownership,
- // so the caller still has the responsibility to destroy the instance
- // on appropriate timing. Also, the caller has the responsibility to call
- // `SetInstance(nullptr)` before destroying the instance.
- // If this is called while the global instance is already set, this will
- // cause crash.
- static void SetInstance(CrosSettings* cros_settings);
-
- // Fires system setting change callback.
- void FireObservers(const std::string& path);
-
- // List of ChromeOS system settings providers.
- std::vector<std::unique_ptr<CrosSettingsProvider>> providers_;
-
- // Owner unique pointer in |providers_|.
- raw_ptr<CrosSettingsProvider> supervised_user_cros_settings_provider_;
-
- // A map from settings names to a list of observers. Observers get fired in
- // the order they are added.
- std::map<std::string, std::unique_ptr<base::RepeatingClosureList>>
- settings_observers_;
-
- SEQUENCE_CHECKER(sequence_checker_);
-};
-
-} // namespace ash
-
-#endif // CHROME_BROWSER_ASH_SETTINGS_CROS_SETTINGS_H_
diff --git a/chrome/browser/ash/settings/cros_settings_holder.cc b/chrome/browser/ash/settings/cros_settings_holder.cc
index 9b3af62..de41351b 100644
--- a/chrome/browser/ash/settings/cros_settings_holder.cc
+++ b/chrome/browser/ash/settings/cros_settings_holder.cc
@@ -9,10 +9,10 @@
#include "base/check_is_test.h"
#include "base/check_op.h"
#include "base/functional/bind.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_provider.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/settings/supervised_user_cros_settings_provider.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/system_settings_provider.h"
namespace ash {
diff --git a/chrome/browser/ash/settings/cros_settings_unittest.cc b/chrome/browser/ash/settings/cros_settings_unittest.cc
index 33e0968..ce12e20 100644
--- a/chrome/browser/ash/settings/cros_settings_unittest.cc
+++ b/chrome/browser/ash/settings/cros_settings_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include <map>
#include <memory>
diff --git a/chrome/browser/ash/settings/device_settings_provider.cc b/chrome/browser/ash/settings/device_settings_provider.cc
index 15834c8..2e9d7a6 100644
--- a/chrome/browser/ash/settings/device_settings_provider.cc
+++ b/chrome/browser/ash/settings/device_settings_provider.cc
@@ -29,13 +29,13 @@
#include "chrome/browser/ash/policy/handlers/device_dlc_predownload_list_policy_handler.h"
#include "chrome/browser/ash/policy/handlers/system_proxy_handler.h"
#include "chrome/browser/ash/policy/off_hours/off_hours_proto_parser.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_cache.h"
#include "chrome/browser/ash/settings/hardware_data_usage_controller.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/ash/tpm_firmware_update.h"
#include "chromeos/ash/components/dbus/dbus_thread_manager.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/policy/core/common/chrome_schema.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/settings/hardware_data_usage_controller.cc b/chrome/browser/ash/settings/hardware_data_usage_controller.cc
index 7926120..37095cf 100644
--- a/chrome/browser/ash/settings/hardware_data_usage_controller.cc
+++ b/chrome/browser/ash/settings/hardware_data_usage_controller.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ash/settings/hardware_data_usage_controller.h"
#include "base/functional/bind.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/settings/owner_pending_setting_controller.cc b/chrome/browser/ash/settings/owner_pending_setting_controller.cc
index 049d4f8c..ae7da37 100644
--- a/chrome/browser/ash/settings/owner_pending_setting_controller.cc
+++ b/chrome/browser/ash/settings/owner_pending_setting_controller.cc
@@ -10,9 +10,9 @@
#include "base/logging.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/ownership/owner_settings_service.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/settings/owner_pending_setting_controller.h b/chrome/browser/ash/settings/owner_pending_setting_controller.h
index b45d9117..1a942ce8 100644
--- a/chrome/browser/ash/settings/owner_pending_setting_controller.h
+++ b/chrome/browser/ash/settings/owner_pending_setting_controller.h
@@ -11,8 +11,8 @@
#include "base/scoped_observation.h"
#include "base/sequence_checker.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/ownership/owner_settings_service.h"
class PrefService;
diff --git a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc
index fc1f532..c1337968 100644
--- a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc
+++ b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc
@@ -11,13 +11,13 @@
#include "base/values.h"
#include "chrome/browser/ash/ownership/fake_owner_settings_service.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/cros_settings_holder.h"
#include "chrome/browser/ash/settings/device_settings_cache.h"
#include "chrome/browser/ash/settings/device_settings_provider.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/ownership/mock_owner_key_util.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "components/policy/proto/device_management_backend.pb.h"
diff --git a/chrome/browser/ash/settings/scoped_testing_cros_settings.cc b/chrome/browser/ash/settings/scoped_testing_cros_settings.cc
index b3ccd81..96c6749 100644
--- a/chrome/browser/ash/settings/scoped_testing_cros_settings.cc
+++ b/chrome/browser/ash/settings/scoped_testing_cros_settings.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/system_settings_provider.h"
namespace ash {
diff --git a/chrome/browser/ash/settings/shutdown_policy_forwarder.cc b/chrome/browser/ash/settings/shutdown_policy_forwarder.cc
index 46de7b8..1b77f61 100644
--- a/chrome/browser/ash/settings/shutdown_policy_forwarder.cc
+++ b/chrome/browser/ash/settings/shutdown_policy_forwarder.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ash/settings/shutdown_policy_forwarder.h"
#include "ash/public/cpp/shutdown_controller.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace ash {
diff --git a/chrome/browser/ash/settings/shutdown_policy_handler.h b/chrome/browser/ash/settings/shutdown_policy_handler.h
index 646f3eca..49b8f61c 100644
--- a/chrome/browser/ash/settings/shutdown_policy_handler.h
+++ b/chrome/browser/ash/settings/shutdown_policy_handler.h
@@ -8,7 +8,7 @@
#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace ash {
diff --git a/chrome/browser/ash/settings/stats_reporting_controller.cc b/chrome/browser/ash/settings/stats_reporting_controller.cc
index b3710a1e..8e3a9572 100644
--- a/chrome/browser/ash/settings/stats_reporting_controller.cc
+++ b/chrome/browser/ash/settings/stats_reporting_controller.cc
@@ -6,7 +6,7 @@
#include "base/functional/bind.h"
#include "base/logging.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/settings/stub_cros_settings_provider.cc b/chrome/browser/ash/settings/stub_cros_settings_provider.cc
index d5869232..9078473 100644
--- a/chrome/browser/ash/settings/stub_cros_settings_provider.cc
+++ b/chrome/browser/ash/settings/stub_cros_settings_provider.cc
@@ -9,8 +9,8 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_provider.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
namespace ash {
diff --git a/chrome/browser/ash/system/device_disabling_browsertest.cc b/chrome/browser/ash/system/device_disabling_browsertest.cc
index b23cbd4..b3b36b1 100644
--- a/chrome/browser/ash/system/device_disabling_browsertest.cc
+++ b/chrome/browser/ash/system/device_disabling_browsertest.cc
@@ -21,7 +21,6 @@
#include "chrome/browser/ash/login/test/scoped_policy_update.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_controller.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
@@ -31,6 +30,7 @@
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
#include "chromeos/ash/components/dbus/shill/shill_manager_client.h"
#include "chromeos/ash/components/dbus/shill/shill_service_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ash/system/device_disabling_manager.h b/chrome/browser/ash/system/device_disabling_manager.h
index 62f84610..3cbd870 100644
--- a/chrome/browser/ash/system/device_disabling_manager.h
+++ b/chrome/browser/ash/system/device_disabling_manager.h
@@ -12,7 +12,7 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
namespace policy {
class BrowserPolicyConnectorAsh;
diff --git a/chrome/browser/ash/system/system_clock.cc b/chrome/browser/ash/system/system_clock.cc
index 79564bb..ed416db 100644
--- a/chrome/browser/ash/system/system_clock.cc
+++ b/chrome/browser/ash/system/system_clock.cc
@@ -11,10 +11,10 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/system_clock_observer.h"
#include "chrome/common/pref_names.h"
#include "chromeos/ash/components/login/login_state/login_state.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/system/timezone_util.cc b/chrome/browser/ash/system/timezone_util.cc
index b4a07361..4ec1269d 100644
--- a/chrome/browser/ash/system/timezone_util.cc
+++ b/chrome/browser/ash/system/timezone_util.cc
@@ -21,7 +21,6 @@
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
@@ -29,6 +28,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
#include "chromeos/ash/components/timezone/timezone_request.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
diff --git a/chrome/browser/ash/tpm_firmware_update.cc b/chrome/browser/ash/tpm_firmware_update.cc
index 1041eba..665fd11 100644
--- a/chrome/browser/ash/tpm_firmware_update.cc
+++ b/chrome/browser/ash/tpm_firmware_update.cc
@@ -21,12 +21,12 @@
#include "base/values.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/enrollment/auto_enrollment_type_checker.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_notification.cc
index 3301875..270869ca 100644
--- a/chrome/browser/ash/u2f_notification.cc
+++ b/chrome/browser/ash/u2f_notification.cc
@@ -13,7 +13,6 @@
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/functional/bind.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/notifications/notification_display_service.h"
#include "chrome/browser/notifications/notification_display_service_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -22,6 +21,7 @@
#include "chrome/browser/ui/browser_navigator_params.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "components/strings/grit/components_strings.h"
#include "third_party/cros_system_api/dbus/debugd/dbus-constants.h"
diff --git a/chrome/browser/browser_process_platform_part_ash.cc b/chrome/browser/browser_process_platform_part_ash.cc
index d9638be..cfa594f 100644
--- a/chrome/browser/browser_process_platform_part_ash.cc
+++ b/chrome/browser/browser_process_platform_part_ash.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/scheduler_configuration_manager.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/cros_settings_holder.h"
#include "chrome/browser/ash/system/automatic_reboot_manager.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
@@ -39,6 +38,7 @@
#include "chromeos/ash/components/browser_context_helper/browser_context_flusher.h"
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
#include "chromeos/ash/components/geolocation/simple_geolocation_provider.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/timezone/timezone_resolver.h"
#include "components/keep_alive_registry/keep_alive_types.h"
#include "components/keep_alive_registry/scoped_keep_alive.h"
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index f129b4b..ed96ab74 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -238,9 +238,9 @@
#include "ash/constants/ash_features.h"
#include "ash/constants/ash_switches.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/hardware_data_usage_controller.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index d30cf8d..b11a816 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -445,7 +445,6 @@
#include "chrome/browser/ash/net/network_health/network_health_manager.h"
#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/smb_client/fileapi/smbfs_file_system_backend_delegate.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/ash/url_handler.h"
@@ -458,6 +457,7 @@
#include "chrome/browser/ui/webui/ash/kerberos/kerberos_in_browser_dialog.h"
#include "chrome/common/webui_url_constants.h"
#include "chromeos/ash/components/browser_context_helper/browser_context_types.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/services/network_health/public/cpp/network_health_helper.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc b/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc
index e8f187ff..a8c448bb 100644
--- a/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc
@@ -2,21 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/extensions/echo_private/echo_private_api.h"
-
#include "base/command_line.h"
#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
#include "chrome/browser/ash/notifications/echo_dialog_view.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
+#include "chrome/browser/chromeos/extensions/echo_private/echo_private_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "content/public/test/browser_test.h"
#include "extensions/browser/api_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc b/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc
index a9fff60..d0e294c 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc
@@ -10,12 +10,12 @@
#include "base/no_destructor.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/ash/login/existing_user_controller.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_ash.h"
#include "chrome/browser/chromeos/extensions/login_screen/login/errors.h"
#include "chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.h"
#include "chrome/browser/ui/ash/session_controller_client_impl.h"
#include "chromeos/ash/components/login/auth/public/user_context.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/session_manager_types.h"
diff --git a/chrome/browser/chromeos/extensions/system_log/system_log_api.cc b/chrome/browser/chromeos/extensions/system_log/system_log_api.cc
index c5ac38c..2787c8d1 100644
--- a/chrome/browser/chromeos/extensions/system_log/system_log_api.cc
+++ b/chrome/browser/chromeos/extensions/system_log/system_log_api.cc
@@ -13,8 +13,8 @@
#include "extensions/common/extension.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/browser_context_helper/browser_context_types.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.cc b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.cc
index ad6cb08..29420b7 100644
--- a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.cc
+++ b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.cc
@@ -8,10 +8,10 @@
#include <utility>
#include "base/logging.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/token_encryptor.h"
#include "chrome/common/pref_names.h"
#include "chromeos/ash/components/cryptohome/system_salt_getter.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.h b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.h
index d0289d1..97a4db2 100644
--- a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.h
+++ b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.h
@@ -8,8 +8,8 @@
#include <optional>
#include "base/memory/raw_ptr.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/device_identity/device_oauth2_token_store.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
class PrefRegistrySimple;
class PrefService;
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
index 0df1e5b..4007e26 100644
--- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -74,11 +74,11 @@
#include "url/gurl.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h"
#include "chrome/browser/extensions/api/file_system/chrome_file_system_delegate_ash.h"
#include "chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h"
#include "chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index 2c5b71b..be72f920 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -81,11 +81,11 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/supervised_user_cros_settings_provider.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_method_short.h"
#include "chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
index a16221f..de55f56 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
@@ -18,7 +18,7 @@
#include "extensions/browser/event_router.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#endif
namespace content {
diff --git a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
index 24b9e76..76221b3 100644
--- a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
+++ b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
@@ -8,7 +8,7 @@
#include "ash/constants/ash_paths.h"
#include "base/path_service.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
namespace extensions {
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
index 2dd0193..89aba6f96 100644
--- a/chrome/browser/extensions/updater/extension_updater.cc
+++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -52,7 +52,7 @@
#include "extensions/common/manifest_url_handlers.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index 81b1620..16c370e 100644
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -52,11 +52,11 @@
#include "chrome/browser/ash/crosapi/browser_util.h"
#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/login/login_pref_names.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/metrics/chromeos_metrics_provider.h"
#include "chrome/browser/metrics/enrollment_status.h"
#include "chromeos/ash/components/dbus/spaced/spaced_client.h"
#include "chromeos/ash/components/login/auth/auth_events_recorder.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "chromeos/version/version_loader.h"
diff --git a/chrome/browser/lifetime/application_lifetime_chromeos.cc b/chrome/browser/lifetime/application_lifetime_chromeos.cc
index ba74fd8b..8d403ef 100644
--- a/chrome/browser/lifetime/application_lifetime_chromeos.cc
+++ b/chrome/browser/lifetime/application_lifetime_chromeos.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "chrome/browser/lifetime/application_lifetime_chromeos.h"
-#include "chrome/browser/lifetime/application_lifetime.h"
#include "ash/constants/ash_pref_names.h"
#include "base/metrics/histogram_functions.h"
@@ -11,8 +10,8 @@
#include "base/values.h"
#include "chrome/browser/ash/boot_times_recorder.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/lifetime/application_lifetime_chromeos.h"
#include "chrome/browser/lifetime/termination_notification.h"
#include "chrome/browser/profiles/profile.h"
@@ -21,6 +20,7 @@
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/ash/components/dbus/update_engine/update_engine_client.h"
#include "chromeos/ash/components/login/session/session_termination_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/dbus/power/power_policy_controller.h"
#include "components/language/core/browser/pref_names.h"
diff --git a/chrome/browser/media/cdm_document_service_impl.cc b/chrome/browser/media/cdm_document_service_impl.cc
index b3d757fb..59e0f88 100644
--- a/chrome/browser/media/cdm_document_service_impl.cc
+++ b/chrome/browser/media/cdm_document_service_impl.cc
@@ -26,7 +26,7 @@
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/media/chromeos_login_and_lock_media_access_handler.cc b/chrome/browser/media/chromeos_login_and_lock_media_access_handler.cc
index 273089a..4e8a524 100644
--- a/chrome/browser/media/chromeos_login_and_lock_media_access_handler.cc
+++ b/chrome/browser/media/chromeos_login_and_lock_media_access_handler.cc
@@ -9,8 +9,8 @@
#include "base/logging.h"
#include "base/values.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
#include "content/public/browser/render_frame_host.h"
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index e766579..3ac79f4 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -32,7 +32,7 @@
#include "ash/constants/ash_switches.h"
#include "base/metrics/histogram_macros.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/permissions/permission_request.h"
#include "components/permissions/permission_uma_util.h"
diff --git a/chrome/browser/metrics/variations/chrome_variations_service_client.cc b/chrome/browser/metrics/variations/chrome_variations_service_client.cc
index 825fe3d3..26957fe 100644
--- a/chrome/browser/metrics/variations/chrome_variations_service_client.cc
+++ b/chrome/browser/metrics/variations/chrome_variations_service_client.cc
@@ -35,8 +35,8 @@
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/policy/chrome_policy_conversions_client.cc b/chrome/browser/policy/chrome_policy_conversions_client.cc
index 7ebd5564..f44c871 100644
--- a/chrome/browser/policy/chrome_policy_conversions_client.cc
+++ b/chrome/browser/policy/chrome_policy_conversions_client.cc
@@ -43,7 +43,7 @@
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc b/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc
index deecab5..4859ff8 100644
--- a/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc
+++ b/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc
@@ -12,12 +12,12 @@
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/network/managed_network_configuration_handler.h"
#include "chromeos/ash/components/network/network_device_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "chromeos/ash/components/system/statistics_provider.h"
diff --git a/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc b/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc
index e4dda36..efad954e 100644
--- a/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc
+++ b/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc
@@ -16,7 +16,6 @@
#include "base/values.h"
#include "chrome/browser/ash/login/session/user_session_manager.h"
#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/policy/networking/device_network_configuration_updater_ash.h"
@@ -27,6 +26,7 @@
#include "chromeos/ash/components/network/mock_managed_network_configuration_handler.h"
#include "chromeos/ash/components/network/onc/onc_certificate_importer.h"
#include "chromeos/ash/components/network/policy_certificate_provider.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/system/fake_statistics_provider.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "chromeos/components/onc/certificate_scope.h"
diff --git a/chrome/browser/policy/restricted_mgs_policy_provider.cc b/chrome/browser/policy/restricted_mgs_policy_provider.cc
index f2055db..e2175d9 100644
--- a/chrome/browser/policy/restricted_mgs_policy_provider.cc
+++ b/chrome/browser/policy/restricted_mgs_policy_provider.cc
@@ -17,7 +17,7 @@
#include "components/policy/policy_constants.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/policy/restricted_mgs_policy_provider_ash_browsertest.cc b/chrome/browser/policy/restricted_mgs_policy_provider_ash_browsertest.cc
index 406e75d..1ccd39d 100644
--- a/chrome/browser/policy/restricted_mgs_policy_provider_ash_browsertest.cc
+++ b/chrome/browser/policy/restricted_mgs_policy_provider_ash_browsertest.cc
@@ -7,11 +7,11 @@
#include "chrome/browser/ash/login/test/session_manager_state_waiter.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
#include "chrome/browser/ash/policy/test_support/embedded_policy_test_server_mixin.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/certificates_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/policy/core/common/policy_bundle.h"
#include "components/policy/core/common/policy_map.h"
#include "components/policy/core/common/policy_namespace.h"
diff --git a/chrome/browser/ui/ash/login_screen_client_impl.cc b/chrome/browser/ui/ash/login_screen_client_impl.cc
index 314f54fe..1a40a7c 100644
--- a/chrome/browser/ui/ash/login_screen_client_impl.cc
+++ b/chrome/browser/ui/ash/login_screen_client_impl.cc
@@ -29,7 +29,6 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/ui/login_display_host_webui.h"
#include "chrome/browser/ash/login/ui/user_adding_screen.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h"
@@ -37,6 +36,7 @@
#include "chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.h"
#include "chrome/browser/ui/webui/ash/login/l10n_util.h"
#include "chrome/common/webui_url_constants.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_provider.h"
#include "components/session_manager/core/session_manager.h"
#include "components/user_manager/user_names.h"
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_impl.h b/chrome/browser/ui/ash/wallpaper_controller_client_impl.h
index fce452cf..d6b0186b 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_impl.h
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_impl.h
@@ -16,8 +16,8 @@
#include "base/scoped_observation.h"
#include "chrome/browser/ash/file_manager/volume_manager.h"
#include "chrome/browser/ash/file_manager/volume_manager_observer.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
index a459c99..647b8df 100644
--- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
+++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_test_helper.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
#include "chrome/browser/profiles/profile.h"
@@ -26,6 +25,7 @@
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
#include "chromeos/ash/components/dbus/vm_plugin_dispatcher/fake_vm_plugin_dispatcher_client.h"
#include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/download/public/background_service/download_metadata.h"
#include "components/download/public/background_service/features.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
index 8acf0624..bab71164 100644
--- a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
@@ -57,7 +57,6 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/profiles/signin_profile_handler.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/certificate_provider/certificate_provider_service.h"
@@ -92,6 +91,7 @@
#include "chromeos/ash/components/login/auth/public/saml_password_attributes.h"
#include "chromeos/ash/components/login/auth/public/sync_trusted_vault_keys.h"
#include "chromeos/ash/components/login/auth/public/user_context.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/components/onc/certificate_scope.h"
#include "chromeos/components/security_token_pin/constants.h"
diff --git a/chrome/browser/ui/webui/ash/login/online_login_utils.cc b/chrome/browser/ui/webui/ash/login/online_login_utils.cc
index 38e8983..b0e1f3c 100644
--- a/chrome/browser/ui/webui/ash/login/online_login_utils.cc
+++ b/chrome/browser/ui/webui/ash/login/online_login_utils.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/ash/login/signin_partition_manager.h"
#include "chrome/browser/ash/login/ui/login_display_host_webui.h"
#include "chrome/browser/ash/login/ui/signin_ui.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/common/chrome_features.h"
@@ -21,6 +20,7 @@
#include "chromeos/ash/components/login/auth/public/auth_types.h"
#include "chromeos/ash/components/login/auth/public/cryptohome_key_constants.h"
#include "chromeos/ash/components/login/auth/public/user_context.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/version/version_loader.h"
#include "components/user_manager/known_user.h"
#include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc b/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc
index 116844e..e42e904 100644
--- a/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc
@@ -11,11 +11,11 @@
#include "base/values.h"
#include "chrome/browser/ash/attestation/tpm_challenge_key_result.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/enterprise/connectors/device_trust/prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/login/login_state/login_state.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc b/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc
index 97ff7bb..01e3eb9 100644
--- a/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/browser_process.h"
@@ -36,6 +35,7 @@
#include "chrome/grit/branded_strings.h"
#include "chrome/grit/chrome_unscaled_resources.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/dbus/constants/dbus_switches.h"
#include "components/login/localized_values_builder.h"
diff --git a/chrome/browser/ui/webui/ash/set_time_ui.cc b/chrome/browser/ui/webui/ash/set_time_ui.cc
index c7610919..737c029 100644
--- a/chrome/browser/ui/webui/ash/set_time_ui.cc
+++ b/chrome/browser/ui/webui/ash/set_time_ui.cc
@@ -18,7 +18,6 @@
#include "base/values.h"
#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/ash/set_time_dialog.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/webui_util.h"
@@ -27,6 +26,7 @@
#include "chrome/grit/set_time_dialog_resources.h"
#include "chrome/grit/set_time_dialog_resources_map.h"
#include "chromeos/ash/components/dbus/system_clock/system_clock_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/timezone_settings.h"
#include "components/strings/grit/components_strings.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.h b/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.h
index 8189782..d5753bb 100644
--- a/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.h
+++ b/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.h
@@ -15,10 +15,10 @@
#include "chrome/browser/ash/crostini/crostini_port_forwarder.h"
#include "chrome/browser/ash/guest_os/guest_id.h"
#include "chrome/browser/ash/guest_os/guest_os_session_tracker.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/ash/components/network/network_state_handler_observer.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/services/app_service/public/cpp/intent.h"
diff --git a/chrome/browser/ui/webui/ash/settings/pages/date_time/date_time_handler.h b/chrome/browser/ui/webui/ash/settings/pages/date_time/date_time_handler.h
index 1c3e30b..735bbe4 100644
--- a/chrome/browser/ui/webui/ash/settings/pages/date_time/date_time_handler.h
+++ b/chrome/browser/ui/webui/ash/settings/pages/date_time/date_time_handler.h
@@ -7,9 +7,9 @@
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
#include "chromeos/ash/components/dbus/system_clock/system_clock_client.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/prefs/pref_change_registrar.h"
namespace ash::settings {
diff --git a/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc b/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc
index 468c187..5c2943a 100644
--- a/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc
+++ b/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc
@@ -14,12 +14,12 @@
#include "base/functional/callback_helpers.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/webui/ash/settings/os_settings_features_util.h"
#include "chromeos/ash/components/dbus/pciguard/pciguard_client.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/peripheral_notification/peripheral_notification_manager.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ui/webui/ash/settings/services/metrics/os_settings_metrics_provider.cc b/chrome/browser/ui/webui/ash/settings/services/metrics/os_settings_metrics_provider.cc
index eb257aa..d82cc4a 100644
--- a/chrome/browser/ui/webui/ash/settings/services/metrics/os_settings_metrics_provider.cc
+++ b/chrome/browser/ui/webui/ash/settings/services/metrics/os_settings_metrics_provider.cc
@@ -6,13 +6,13 @@
#include "base/metrics/histogram_functions.h"
#include "chrome/browser/ash/login/login_pref_names.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/ash/settings/services/metrics/settings_user_action_tracker.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/metrics/metrics_service.h"
diff --git a/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc
index ffcfc8d..230c6c9 100644
--- a/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc
+++ b/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc
@@ -20,8 +20,8 @@
#include "base/values.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/crx_file/id_util.h"
#include "components/strings/grit/components_strings.h"
diff --git a/chrome/browser/ui/webui/flags/flags_ui.cc b/chrome/browser/ui/webui/flags/flags_ui.cc
index ea25114f..3bcd3133 100644
--- a/chrome/browser/ui/webui/flags/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags/flags_ui.cc
@@ -46,9 +46,9 @@
#include "base/system/sys_info.h"
#include "chrome/browser/ash/login/session/user_session_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/infobars/simple_alert_infobar_creator.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "components/account_id/account_id.h"
#include "components/infobars/content/content_infobar_manager.h"
#include "components/infobars/core/simple_alert_infobar_delegate.h"
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
index 5b452f7e7..49db3e7 100644
--- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc
+++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -11,7 +11,7 @@
#include "ash/constants/ash_switches.h"
#include "base/logging.h"
#include "base/values.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
namespace help_utils_chromeos {
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index 01038cf..9dc4d9b4 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/browser_management/management_service_factory.h"
#include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
@@ -27,6 +26,7 @@
#include "chromeos/ash/components/network/network_state.h"
#include "chromeos/ash/components/network/network_state_handler.h"
#include "chromeos/ash/components/network/network_type_pattern.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/strings/grit/chromeos_strings.h"
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
index 83f5a1e1..d2b909e 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -76,7 +76,6 @@
#include "chrome/browser/ash/policy/uploading/status_uploader.h"
#include "chrome/browser/ash/policy/uploading/system_log_uploader.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.h"
#include "chrome/browser/net/stub_resolver_config_reader.h"
@@ -86,6 +85,7 @@
#include "chromeos/ash/components/network/network_state_handler.h"
#include "chromeos/ash/components/network/proxy/proxy_config_handler.h"
#include "chromeos/ash/components/network/proxy/ui_proxy_config_service.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#include "components/enterprise/browser/reporting/common_pref_names.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index d64adc5..0794658 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -66,7 +66,6 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/tpm_firmware_update.h"
#include "chrome/browser/ui/webui/ash/extended_updates/extended_updates_dialog.h"
#include "chrome/browser/ui/webui/ash/image_source.h"
@@ -77,6 +76,7 @@
#include "chromeos/ash/components/fwupd/firmware_update_manager.h"
#include "chromeos/ash/components/network/network_state.h"
#include "chromeos/ash/components/network/network_state_handler.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/system/statistics_provider.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/version/version_loader.h"
diff --git a/chrome/browser/usb/usb_chooser_context.cc b/chrome/browser/usb/usb_chooser_context.cc
index 9d85742d..46bf692 100644
--- a/chrome/browser/usb/usb_chooser_context.cc
+++ b/chrome/browser/usb/usb_chooser_context.cc
@@ -29,7 +29,7 @@
#include "ui/base/l10n/l10n_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
#include "chromeos/ash/components/settings/cros_settings_names.h"
#endif
