[iOS] Move pref_names to the prefs/ folder
Bug: 1354614
Change-Id: Ife06d8c30941274ce0aa0221efcbcce34d15dbfa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3850516
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Auto-Submit: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1039144}
diff --git a/ios/chrome/app/application_delegate/metrics_mediator.mm b/ios/chrome/app/application_delegate/metrics_mediator.mm
index 5a2c2cd..84bc913a 100644
--- a/ios/chrome/app/application_delegate/metrics_mediator.mm
+++ b/ios/chrome/app/application_delegate/metrics_mediator.mm
@@ -29,7 +29,7 @@
#include "ios/chrome/browser/crash_report/crash_helper.h"
#include "ios/chrome/browser/main/browser.h"
#include "ios/chrome/browser/metrics/first_user_action_recorder.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/signin_util.h"
#include "ios/chrome/browser/system_flags.h"
#import "ios/chrome/browser/ui/default_promo/default_browser_utils.h"
diff --git a/ios/chrome/app/main_controller.mm b/ios/chrome/app/main_controller.mm
index b6c2fd5b..42e0ebb 100644
--- a/ios/chrome/app/main_controller.mm
+++ b/ios/chrome/app/main_controller.mm
@@ -89,7 +89,7 @@
#import "ios/chrome/browser/metrics/window_configuration_recorder.h"
#import "ios/chrome/browser/omaha/omaha_service.h"
#import "ios/chrome/browser/passwords/password_manager_util_ios.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/screenshot/screenshot_metrics_recorder.h"
#import "ios/chrome/browser/search_engines/extension_search_engine_data_updater.h"
#include "ios/chrome/browser/search_engines/search_engines_util.h"
diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn
index fba5383..f65b9bf 100644
--- a/ios/chrome/browser/BUILD.gn
+++ b/ios/chrome/browser/BUILD.gn
@@ -114,9 +114,9 @@
public_deps = [
":chrome_paths",
":chrome_url_constants",
- ":pref_names",
":utils",
"//ios/chrome/browser/application_context",
+ "//ios/chrome/browser/prefs:pref_names",
]
allow_circular_includes_from = [
"//ios/chrome/browser/sync/glue",
@@ -162,14 +162,6 @@
frameworks = [ "UIKit.framework" ]
}
-source_set("pref_names") {
- configs += [ "//build/config/compiler:enable_arc" ]
- sources = [
- "pref_names.cc",
- "pref_names.h",
- ]
-}
-
source_set("browser_impl") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
diff --git a/ios/chrome/browser/application_context/BUILD.gn b/ios/chrome/browser/application_context/BUILD.gn
index b9a2356..ab801c59 100644
--- a/ios/chrome/browser/application_context/BUILD.gn
+++ b/ios/chrome/browser/application_context/BUILD.gn
@@ -40,7 +40,6 @@
"//ios/chrome/app:tests_hook",
"//ios/chrome/browser",
"//ios/chrome/browser:chrome_paths",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/browser_state:browser_state_impl",
"//ios/chrome/browser/component_updater",
@@ -52,6 +51,7 @@
"//ios/chrome/browser/policy",
"//ios/chrome/browser/prefs",
"//ios/chrome/browser/prefs:browser_prefs",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/promos_manager",
"//ios/chrome/browser/promos_manager:features",
"//ios/chrome/browser/push_notification:push_notification_service",
diff --git a/ios/chrome/browser/application_context/application_context_impl.mm b/ios/chrome/browser/application_context/application_context_impl.mm
index 8b791be..8dc0d1a 100644
--- a/ios/chrome/browser/application_context/application_context_impl.mm
+++ b/ios/chrome/browser/application_context/application_context_impl.mm
@@ -55,9 +55,9 @@
#import "ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h"
#import "ios/chrome/browser/policy/browser_policy_connector_ios.h"
#import "ios/chrome/browser/policy/configuration_policy_handler_list_factory.h"
-#import "ios/chrome/browser/pref_names.h"
#import "ios/chrome/browser/prefs/browser_prefs.h"
#import "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/promos_manager/features.h"
#import "ios/chrome/browser/promos_manager/promos_manager.h"
#import "ios/chrome/browser/push_notification/push_notification_service.h"
diff --git a/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.mm b/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.mm
index dc3d18ef..90bda1f 100644
--- a/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.mm
+++ b/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.mm
@@ -33,7 +33,7 @@
#import "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/main/browser_list.h"
#import "ios/chrome/browser/main/browser_list_factory.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#include "ios/chrome/browser/signin/identity_manager_factory.h"
#include "ios/chrome/browser/sync/sync_service_factory.h"
diff --git a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.mm b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.mm
index b6c1702..ec1e7cb 100644
--- a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.mm
+++ b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.mm
@@ -14,7 +14,7 @@
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/history/history_service_factory.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#include "ios/chrome/browser/search_engines/ui_thread_search_terms_data.h"
diff --git a/ios/chrome/browser/bookmarks/bookmarks_utils.cc b/ios/chrome/browser/bookmarks/bookmarks_utils.cc
index c670a39..2171f5e 100644
--- a/ios/chrome/browser/bookmarks/bookmarks_utils.cc
+++ b/ios/chrome/browser/bookmarks/bookmarks_utils.cc
@@ -11,7 +11,7 @@
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
diff --git a/ios/chrome/browser/browser_state/BUILD.gn b/ios/chrome/browser/browser_state/BUILD.gn
index 3481db4e..e41e726c 100644
--- a/ios/chrome/browser/browser_state/BUILD.gn
+++ b/ios/chrome/browser/browser_state/BUILD.gn
@@ -32,8 +32,8 @@
"//components/variations/net",
"//components/webdata_services",
"//ios/chrome/browser:chrome_url_constants",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/net:net_types",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/components/webui:url_constants",
"//ios/web/public/webui",
]
diff --git a/ios/chrome/browser/browser_state/browser_state_info_cache.cc b/ios/chrome/browser/browser_state/browser_state_info_cache.cc
index 00219ea..86a4599a 100644
--- a/ios/chrome/browser/browser_state/browser_state_info_cache.cc
+++ b/ios/chrome/browser/browser_state/browser_state_info_cache.cc
@@ -19,7 +19,7 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/scoped_user_pref_update.h"
#include "ios/chrome/browser/browser_state/browser_state_info_cache_observer.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
namespace {
const char kGAIAIdKey[] = "gaia_id";
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl.mm b/ios/chrome/browser/browser_state/chrome_browser_state_impl.mm
index de4d69e..9e82184d 100644
--- a/ios/chrome/browser/browser_state/chrome_browser_state_impl.mm
+++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl.mm
@@ -36,9 +36,9 @@
#include "ios/chrome/browser/policy/browser_state_policy_connector.h"
#include "ios/chrome/browser/policy/browser_state_policy_connector_factory.h"
#include "ios/chrome/browser/policy/schema_registry_factory.h"
-#include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/prefs/browser_prefs.h"
#include "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/web/public/thread/web_thread.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm
index 7dd47c10..adc5f284 100644
--- a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm
+++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm
@@ -26,7 +26,7 @@
#include "ios/chrome/browser/net/http_server_properties_factory.h"
#include "ios/chrome/browser/net/ios_chrome_network_delegate.h"
#include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/components/cookie_util/cookie_util.h"
#import "ios/net/cookies/cookie_store_ios.h"
#import "ios/net/cookies/ns_http_system_cookie_store.h"
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm b/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm
index 3d5a8a4..0ad59e6 100644
--- a/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm
+++ b/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm
@@ -29,7 +29,7 @@
#include "ios/chrome/browser/chrome_paths.h"
#include "ios/chrome/browser/optimization_guide/optimization_guide_service.h"
#include "ios/chrome/browser/optimization_guide/optimization_guide_service_factory.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/segmentation_platform/segmentation_platform_service_factory.h"
#include "ios/chrome/browser/signin/account_consistency_service_factory.h"
#include "ios/chrome/browser/signin/account_reconcilor_factory.h"
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm
index 82e561c..c6b8e21 100644
--- a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm
+++ b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm
@@ -20,7 +20,7 @@
#include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h"
#include "ios/chrome/browser/chrome_constants.h"
#include "ios/chrome/browser/chrome_paths_internal.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
#import "ios/public/provider/chrome/browser/signin/chrome_identity.h"
diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm
index da8b4bcd..5db8bdc 100644
--- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm
+++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm
@@ -19,7 +19,7 @@
#include "ios/chrome/browser/ios_chrome_io_thread.h"
#include "ios/chrome/browser/net/ios_chrome_network_delegate.h"
#include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/components/cookie_util/cookie_util.h"
#import "ios/net/cookies/system_cookie_store.h"
#include "ios/web/public/thread/web_task_traits.h"
diff --git a/ios/chrome/browser/commerce/BUILD.gn b/ios/chrome/browser/commerce/BUILD.gn
index b05290c7..79f720c 100644
--- a/ios/chrome/browser/commerce/BUILD.gn
+++ b/ios/chrome/browser/commerce/BUILD.gn
@@ -18,9 +18,9 @@
"//components/prefs:prefs",
"//components/unified_consent:unified_consent",
"//ios/chrome/browser",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/optimization_guide",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin:signin",
"//ios/chrome/browser/ui:feature_flags",
"//ios/web",
@@ -66,10 +66,10 @@
"//components/optimization_guide/core:test_support",
"//components/sync_preferences:test_support",
"//components/unified_consent:unified_consent",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/optimization_guide:optimization_guide",
"//ios/chrome/browser/optimization_guide:unit_tests",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin:signin",
"//ios/chrome/browser/signin:test_support",
"//ios/chrome/browser/ui:feature_flags",
diff --git a/ios/chrome/browser/commerce/price_alert_util.mm b/ios/chrome/browser/commerce/price_alert_util.mm
index 5569296..2e9f178 100644
--- a/ios/chrome/browser/commerce/price_alert_util.mm
+++ b/ios/chrome/browser/commerce/price_alert_util.mm
@@ -9,7 +9,7 @@
#include "components/prefs/pref_service.h"
#include "components/unified_consent/url_keyed_data_collection_consent_helper.h"
#import "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/ui/ui_feature_flags.h"
diff --git a/ios/chrome/browser/commerce/price_alert_util_unittest.mm b/ios/chrome/browser/commerce/price_alert_util_unittest.mm
index d2c4121..2502096 100644
--- a/ios/chrome/browser/commerce/price_alert_util_unittest.mm
+++ b/ios/chrome/browser/commerce/price_alert_util_unittest.mm
@@ -10,7 +10,7 @@
#include "components/unified_consent/pref_names.h"
#include "components/unified_consent/unified_consent_service.h"
#import "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
#import "ios/chrome/browser/ui/ui_feature_flags.h"
diff --git a/ios/chrome/browser/follow/BUILD.gn b/ios/chrome/browser/follow/BUILD.gn
index 2cde0d1..283133c 100644
--- a/ios/chrome/browser/follow/BUILD.gn
+++ b/ios/chrome/browser/follow/BUILD.gn
@@ -101,9 +101,9 @@
"//base",
"//components/keyed_service/ios",
"//components/pref_registry:pref_registry",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/discover_feed:discover_feed_factory",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/public/provider/chrome/browser/follow:follow_api",
]
}
@@ -122,7 +122,6 @@
"//components/feed/core/shared_prefs:feed_shared_prefs",
"//components/prefs",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser:utils",
"//ios/chrome/browser/browser_state:browser_state",
"//ios/chrome/browser/discover_feed:discover_feed",
@@ -131,6 +130,7 @@
"//ios/chrome/browser/follow:service_factory",
"//ios/chrome/browser/main:public",
"//ios/chrome/browser/net:crurl",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/commands",
"//ios/chrome/browser/ui/follow",
"//ios/chrome/browser/ui/ntp:metrics",
diff --git a/ios/chrome/browser/follow/follow_browser_agent.mm b/ios/chrome/browser/follow/follow_browser_agent.mm
index 1384b23..12e9c27 100644
--- a/ios/chrome/browser/follow/follow_browser_agent.mm
+++ b/ios/chrome/browser/follow/follow_browser_agent.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/browser/follow/follow_service_factory.h"
#import "ios/chrome/browser/follow/web_page_urls.h"
#import "ios/chrome/browser/main/browser.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/system_flags.h"
#import "ios/chrome/browser/ui/commands/feed_commands.h"
#import "ios/chrome/browser/ui/commands/new_tab_page_commands.h"
diff --git a/ios/chrome/browser/follow/follow_service_factory.mm b/ios/chrome/browser/follow/follow_service_factory.mm
index 3d748f5..1aea47e 100644
--- a/ios/chrome/browser/follow/follow_service_factory.mm
+++ b/ios/chrome/browser/follow/follow_service_factory.mm
@@ -11,7 +11,7 @@
#import "ios/chrome/browser/discover_feed/discover_feed_service_factory.h"
#import "ios/chrome/browser/follow/follow_configuration.h"
#import "ios/chrome/browser/follow/follow_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/public/provider/chrome/browser/follow/follow_api.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/https_upgrades/BUILD.gn b/ios/chrome/browser/https_upgrades/BUILD.gn
index ffb3831f..041191d 100644
--- a/ios/chrome/browser/https_upgrades/BUILD.gn
+++ b/ios/chrome/browser/https_upgrades/BUILD.gn
@@ -20,9 +20,9 @@
"//components/keyed_service/ios",
"//components/prefs:prefs",
"//components/security_interstitials/core",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/content_settings:content_settings",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/prerender",
"//ios/components/security_interstitials",
"//ios/components/security_interstitials/https_only_mode",
@@ -44,8 +44,8 @@
"//components/keyed_service/ios",
"//components/prefs:test_support",
"//components/security_interstitials/core",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/prerender",
"//ios/chrome/browser/prerender:test_support",
"//ios/components/security_interstitials/https_only_mode",
@@ -122,8 +122,8 @@
"//components/omnibox/common",
"//components/security_interstitials/core",
"//components/strings:components_strings_grit",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/metrics:eg_test_support+eg2",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/test:eg_test_support+eg2",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/components/security_interstitials/https_only_mode:feature",
diff --git a/ios/chrome/browser/https_upgrades/https_only_mode_egtest.mm b/ios/chrome/browser/https_upgrades/https_only_mode_egtest.mm
index 5117c05..cfe7722 100644
--- a/ios/chrome/browser/https_upgrades/https_only_mode_egtest.mm
+++ b/ios/chrome/browser/https_upgrades/https_only_mode_egtest.mm
@@ -16,7 +16,7 @@
#import "ios/chrome/browser/https_upgrades/https_upgrade_app_interface.h"
#import "ios/chrome/browser/https_upgrades/https_upgrade_test_helper.h"
#import "ios/chrome/browser/metrics/metrics_app_interface.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
diff --git a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm
index e773e47..134e7e1 100644
--- a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm
+++ b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm
@@ -12,7 +12,7 @@
#include "components/security_interstitials/core/https_only_mode_metrics.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/https_upgrades/https_upgrade_service_factory.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/prerender/prerender_service.h"
#import "ios/chrome/browser/prerender/prerender_service_factory.h"
#import "ios/components/security_interstitials/https_only_mode/https_only_mode_blocking_page.h"
diff --git a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper_unittest.mm b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper_unittest.mm
index 5961ba1..9055a12 100644
--- a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper_unittest.mm
+++ b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper_unittest.mm
@@ -10,7 +10,7 @@
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#include "ios/chrome/browser/https_upgrades/https_upgrade_service_factory.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/prerender/fake_prerender_service.h"
#import "ios/chrome/browser/prerender/prerender_service.h"
#import "ios/chrome/browser/prerender/prerender_service_factory.h"
diff --git a/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper_egtest.mm b/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper_egtest.mm
index 0a65657..a0822ab4 100644
--- a/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper_egtest.mm
+++ b/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper_egtest.mm
@@ -15,7 +15,7 @@
#import "ios/chrome/browser/https_upgrades/https_upgrade_app_interface.h"
#import "ios/chrome/browser/https_upgrades/https_upgrade_test_helper.h"
#import "ios/chrome/browser/metrics/metrics_app_interface.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
#import "ios/chrome/test/earl_grey/chrome_matchers.h"
diff --git a/ios/chrome/browser/ios_chrome_main_parts.mm b/ios/chrome/browser/ios_chrome_main_parts.mm
index 8d73ee6..f32564d8 100644
--- a/ios/chrome/browser/ios_chrome_main_parts.mm
+++ b/ios/chrome/browser/ios_chrome_main_parts.mm
@@ -60,7 +60,7 @@
#include "ios/chrome/browser/metrics/ios_expired_histograms_array.h"
#include "ios/chrome/browser/open_from_clipboard/create_clipboard_recent_content.h"
#include "ios/chrome/browser/policy/browser_policy_connector_ios.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/promos_manager/promos_manager.h"
#import "ios/chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h"
#import "ios/chrome/browser/signin/signin_util.h"
diff --git a/ios/chrome/browser/memory/memory_debugger_manager.mm b/ios/chrome/browser/memory/memory_debugger_manager.mm
index 7a2d9dc..7af3b18 100644
--- a/ios/chrome/browser/memory/memory_debugger_manager.mm
+++ b/ios/chrome/browser/memory/memory_debugger_manager.mm
@@ -9,7 +9,7 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#import "ios/chrome/browser/memory/memory_debugger.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
diff --git a/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider.mm b/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider.mm
index f22f25e..cde817d 100644
--- a/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider.mm
+++ b/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider.mm
@@ -7,7 +7,7 @@
#import "base/metrics/histogram_functions.h"
#import "components/feed/core/shared_prefs/pref_names.h"
#import "components/prefs/pref_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider_unittest.mm b/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider_unittest.mm
index 7e76753..9afcdac2 100644
--- a/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider_unittest.mm
+++ b/ios/chrome/browser/metrics/ios_feed_enabled_metrics_provider_unittest.mm
@@ -9,7 +9,7 @@
#import "components/metrics/metrics_log_uploader.h"
#import "components/prefs/pref_registry_simple.h"
#import "components/prefs/testing_pref_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "testing/platform_test.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/net/http_server_properties_factory.cc b/ios/chrome/browser/net/http_server_properties_factory.cc
index f1eb0f3b..ce8ac04 100644
--- a/ios/chrome/browser/net/http_server_properties_factory.cc
+++ b/ios/chrome/browser/net/http_server_properties_factory.cc
@@ -10,7 +10,7 @@
#include "base/values.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/json_pref_store.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/web/public/thread/web_thread.h"
#include "net/http/http_server_properties.h"
diff --git a/ios/chrome/browser/net/ios_chrome_network_delegate.cc b/ios/chrome/browser/net/ios_chrome_network_delegate.cc
index 13930fa..dcc0dd7a 100644
--- a/ios/chrome/browser/net/ios_chrome_network_delegate.cc
+++ b/ios/chrome/browser/net/ios_chrome_network_delegate.cc
@@ -18,7 +18,7 @@
#include "components/content_settings/core/common/content_settings.h"
#include "components/prefs/pref_member.h"
#include "components/prefs/pref_service.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/web/public/thread/web_task_traits.h"
#include "ios/web/public/thread/web_thread.h"
#include "net/base/load_flags.h"
diff --git a/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter.mm b/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter.mm
index 3614c428..9544a0f3 100644
--- a/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter.mm
+++ b/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter.mm
@@ -8,7 +8,7 @@
#include "components/url_formatter/url_fixer.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/chrome_url_constants.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/system_flags.h"
#include "ios/components/webui/web_ui_url_constants.h"
#include "ios/web/public/browser_state.h"
diff --git a/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter_unittest.mm b/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter_unittest.mm
index 4e122b34..890a15e7 100644
--- a/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter_unittest.mm
+++ b/ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter_unittest.mm
@@ -8,7 +8,7 @@
#include "components/sync_preferences/testing_pref_service_syncable.h"
#import "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#include "ios/chrome/browser/chrome_url_constants.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/web/public/test/fakes/fake_browser_state.h"
#import "ios/web/public/test/web_task_environment.h"
#include "testing/platform_test.h"
diff --git a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
index 02594d2..adb5b32 100644
--- a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
+++ b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
@@ -14,7 +14,7 @@
#include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h"
#include "ios/chrome/browser/history/history_service_factory.h"
#include "ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
#include "ios/chrome/browser/signin/identity_manager_factory.h"
diff --git a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm
index a46eeb2..d90d481 100644
--- a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm
+++ b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm
@@ -41,7 +41,7 @@
#include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h"
#include "ios/chrome/browser/history/history_service_factory.h"
#include "ios/chrome/browser/json_parser/in_process_json_parser.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/signin/identity_manager_factory.h"
#include "ios/chrome/browser/ui/ui_feature_flags.h"
#include "ios/chrome/common/channel_info.h"
diff --git a/ios/chrome/browser/policy/BUILD.gn b/ios/chrome/browser/policy/BUILD.gn
index 68608d6..2573dae6 100644
--- a/ios/chrome/browser/policy/BUILD.gn
+++ b/ios/chrome/browser/policy/BUILD.gn
@@ -84,9 +84,9 @@
"//components/version_info:version_info",
"//ios/chrome/app/application_delegate:app_state_header",
"//ios/chrome/browser",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/main:public",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin",
"//ios/chrome/browser/ui/authentication/signin:signin_headers",
"//ios/chrome/browser/ui/commands",
@@ -111,7 +111,7 @@
deps = [
"//base",
"//components/prefs",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
]
}
@@ -197,12 +197,12 @@
"//google_apis",
"//ios/chrome/app/application_delegate:app_state_header",
"//ios/chrome/browser:chrome_paths",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser:utils",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/main:test_support",
"//ios/chrome/browser/prefs",
"//ios/chrome/browser/prefs:browser_prefs",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin:signin",
"//ios/chrome/browser/signin:test_support",
"//ios/chrome/browser/ui/authentication/enterprise/enterprise_prompt",
@@ -252,9 +252,9 @@
"//google_apis",
"//ios/chrome/app/strings:ios_strings_grit",
"//ios/chrome/browser:chrome_url_constants",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser:utils",
"//ios/chrome/browser/policy:eg_test_support+eg2",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/translate:eg_test_support+eg2",
"//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
"//ios/chrome/browser/ui/content_suggestions:constants",
diff --git a/ios/chrome/browser/policy/browser_signin_policy_handler.cc b/ios/chrome/browser/policy/browser_signin_policy_handler.cc
index 70e5165..31553d4 100644
--- a/ios/chrome/browser/policy/browser_signin_policy_handler.cc
+++ b/ios/chrome/browser/policy/browser_signin_policy_handler.cc
@@ -16,7 +16,7 @@
#include "components/signin/public/base/signin_pref_names.h"
#include "components/strings/grit/components_strings.h"
#include "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
namespace policy {
BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema)
diff --git a/ios/chrome/browser/policy/browser_signin_policy_handler_unittest.mm b/ios/chrome/browser/policy/browser_signin_policy_handler_unittest.mm
index 9d82007..619d1c93 100644
--- a/ios/chrome/browser/policy/browser_signin_policy_handler_unittest.mm
+++ b/ios/chrome/browser/policy/browser_signin_policy_handler_unittest.mm
@@ -15,7 +15,7 @@
#include "components/signin/public/base/signin_pref_names.h"
#include "ios/chrome/browser/chrome_switches.h"
#include "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
diff --git a/ios/chrome/browser/policy/configuration_policy_handler_list_factory.mm b/ios/chrome/browser/policy/configuration_policy_handler_list_factory.mm
index 9d069c8..26b9829 100644
--- a/ios/chrome/browser/policy/configuration_policy_handler_list_factory.mm
+++ b/ios/chrome/browser/policy/configuration_policy_handler_list_factory.mm
@@ -37,7 +37,7 @@
#include "ios/chrome/browser/policy/browser_signin_policy_handler.h"
#include "ios/chrome/browser/policy/new_tab_page_location_policy_handler.h"
#import "ios/chrome/browser/policy/restrict_accounts_policy_handler.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
diff --git a/ios/chrome/browser/policy/new_tab_page_location_policy_handler.cc b/ios/chrome/browser/policy/new_tab_page_location_policy_handler.cc
index 09d556e1..4727b363 100644
--- a/ios/chrome/browser/policy/new_tab_page_location_policy_handler.cc
+++ b/ios/chrome/browser/policy/new_tab_page_location_policy_handler.cc
@@ -12,7 +12,7 @@
#include "components/prefs/pref_service.h"
#include "components/prefs/pref_value_map.h"
#include "components/strings/grit/components_strings.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "url/gurl.h"
class GURL;
diff --git a/ios/chrome/browser/policy/new_tab_page_location_policy_handler_unittest.cc b/ios/chrome/browser/policy/new_tab_page_location_policy_handler_unittest.cc
index c902cfe..b6434851 100644
--- a/ios/chrome/browser/policy/new_tab_page_location_policy_handler_unittest.cc
+++ b/ios/chrome/browser/policy/new_tab_page_location_policy_handler_unittest.cc
@@ -8,7 +8,7 @@
#include "components/policy/core/common/policy_map.h"
#include "components/policy/policy_constants.h"
#include "components/prefs/pref_value_map.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
diff --git a/ios/chrome/browser/policy/policy_egtest.mm b/ios/chrome/browser/policy/policy_egtest.mm
index d2bbe776..7ae49df 100644
--- a/ios/chrome/browser/policy/policy_egtest.mm
+++ b/ios/chrome/browser/policy/policy_egtest.mm
@@ -22,7 +22,7 @@
#import "ios/chrome/browser/chrome_url_constants.h"
#import "ios/chrome/browser/policy/policy_app_interface.h"
#import "ios/chrome/browser/policy/policy_earl_grey_utils.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/translate/translate_app_interface.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui_test_util.h"
diff --git a/ios/chrome/browser/policy/policy_platform_provider_egtest.mm b/ios/chrome/browser/policy/policy_platform_provider_egtest.mm
index 974ea7f..75408fe 100644
--- a/ios/chrome/browser/policy/policy_platform_provider_egtest.mm
+++ b/ios/chrome/browser/policy/policy_platform_provider_egtest.mm
@@ -15,7 +15,7 @@
#include "components/strings/grit/components_strings.h"
#include "ios/chrome/browser/chrome_url_constants.h"
#import "ios/chrome/browser/policy/policy_app_interface.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#include "ios/chrome/test/earl_grey/chrome_test_case.h"
#include "ios/testing/earl_grey/app_launch_configuration.h"
diff --git a/ios/chrome/browser/policy/policy_unittest.mm b/ios/chrome/browser/policy/policy_unittest.mm
index 6f437b3..fa5a737d 100644
--- a/ios/chrome/browser/policy/policy_unittest.mm
+++ b/ios/chrome/browser/policy/policy_unittest.mm
@@ -19,7 +19,7 @@
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#include "ios/chrome/browser/chrome_paths.h"
#include "ios/chrome/browser/policy/enterprise_policy_test_helper.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
diff --git a/ios/chrome/browser/policy/policy_util.mm b/ios/chrome/browser/policy/policy_util.mm
index cfe1009..7587bb6 100644
--- a/ios/chrome/browser/policy/policy_util.mm
+++ b/ios/chrome/browser/policy/policy_util.mm
@@ -5,7 +5,7 @@
#import "ios/chrome/browser/policy/policy_util.h"
#include "components/prefs/pref_service.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
diff --git a/ios/chrome/browser/policy/policy_watcher_browser_agent.mm b/ios/chrome/browser/policy/policy_watcher_browser_agent.mm
index e9134116..34892c0 100644
--- a/ios/chrome/browser/policy/policy_watcher_browser_agent.mm
+++ b/ios/chrome/browser/policy/policy_watcher_browser_agent.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/browser/application_context/application_context.h"
#import "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/policy/policy_watcher_browser_agent_observer.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/ui/authentication/signin/signin_utils.h"
#import "ios/chrome/browser/ui/commands/policy_change_commands.h"
diff --git a/ios/chrome/browser/policy/policy_watcher_browser_agent_unittest.mm b/ios/chrome/browser/policy/policy_watcher_browser_agent_unittest.mm
index a17ccd7..1b6c515 100644
--- a/ios/chrome/browser/policy/policy_watcher_browser_agent_unittest.mm
+++ b/ios/chrome/browser/policy/policy_watcher_browser_agent_unittest.mm
@@ -19,8 +19,8 @@
#import "ios/chrome/browser/main/test_browser.h"
#import "ios/chrome/browser/policy/policy_util.h"
#include "ios/chrome/browser/policy/policy_watcher_browser_agent_observer_bridge.h"
-#import "ios/chrome/browser/pref_names.h"
#import "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
#import "ios/chrome/browser/ui/commands/application_commands.h"
diff --git a/ios/chrome/browser/pref_names.h b/ios/chrome/browser/pref_names.h
deleted file mode 100644
index ab88bf5..0000000
--- a/ios/chrome/browser/pref_names.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_CHROME_BROWSER_PREF_NAMES_H_
-#define IOS_CHROME_BROWSER_PREF_NAMES_H_
-
-namespace prefs {
-
-extern const char kApplicationLocale[];
-extern const char kArticlesForYouEnabled[];
-extern const char kBrowserStateInfoCache[];
-extern const char kBrowserStateLastUsed[];
-extern const char kBrowserStatesLastActive[];
-extern const char kBrowserStatesNumCreated[];
-extern const char kBrowsingDataMigrationHasBeenPossible[];
-extern const char kClearBrowsingDataHistoryNoticeShownTimes[];
-extern const char kContextualSearchEnabled[];
-extern const char kDataSaverEnabled[];
-extern const char kDefaultCharset[];
-extern const char kEnableDoNotTrack[];
-extern const char kFirstFollowUIShownCount[];
-extern const char kHttpServerProperties[];
-extern const char kIncognitoModeAvailability[];
-extern const char kIncognitoInterstitialEnabled[];
-extern const char kIosBookmarkCachedFolderId[];
-extern const char kIosBookmarkCachedTopMostRow[];
-extern const char kIosBookmarkFolderDefault[];
-extern const char kIosBookmarkPromoAlreadySeen[];
-extern const char kIosBookmarkSigninPromoDisplayedCount[];
-extern const char kIosShareChromeCount[];
-extern const char kIosShareChromeLastShare[];
-extern const char kIosDiscoverFeedLastRefreshTime[];
-extern const char kIosPromosManagerActivePromos[];
-extern const char kIosPromosManagerImpressions[];
-extern const char kIosSettingsPromoAlreadySeen[];
-extern const char kIosSettingsSigninPromoDisplayedCount[];
-extern const char kIosNtpFeedTopPromoAlreadySeen[];
-extern const char kIosNtpFeedTopSigninPromoDisplayedCount[];
-extern const char kLinkPreviewEnabled[];
-extern const char kNTPContentSuggestionsEnabled[];
-extern const char kNTPFollowingFeedSortType[];
-extern const char kOverflowMenuDestinationUsageHistory[];
-extern const char kPrintingEnabled[];
-extern const char kSearchSuggestEnabled[];
-extern const char kTrackPricesOnTabsEnabled[];
-
-extern const char kNetworkPredictionSetting[];
-
-extern const char kNtpShownBookmarksFolder[];
-extern const char kShowMemoryDebuggingTools[];
-
-extern const char kSigninLastAccounts[];
-extern const char kSigninLastAccountsMigrated[];
-extern const char kSigninShouldPromptForSigninAgain[];
-extern const char kSigninWebSignDismissalCount[];
-
-extern const char kIosUserZoomMultipliers[];
-
-extern const char kIncognitoAuthenticationSetting[];
-
-extern const char kBrowserSigninPolicy[];
-extern const char kAllowChromeDataInBackups[];
-
-extern const char kNewTabPageLocationOverride[];
-
-extern const char kHttpsOnlyModeEnabled[];
-
-} // namespace prefs
-
-#endif // IOS_CHROME_BROWSER_PREF_NAMES_H_
diff --git a/ios/chrome/browser/prefs/BUILD.gn b/ios/chrome/browser/prefs/BUILD.gn
index bb92416b..e5bbc98a 100644
--- a/ios/chrome/browser/prefs/BUILD.gn
+++ b/ios/chrome/browser/prefs/BUILD.gn
@@ -25,8 +25,10 @@
source_set("pref_names") {
configs += [ "//build/config/compiler:enable_arc" ]
- sources = [ "pref_names.h" ]
- public_deps = [ "//ios/chrome/browser:pref_names" ]
+ sources = [
+ "pref_names.cc",
+ "pref_names.h",
+ ]
}
source_set("browser_prefs") {
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index f4b3a464..1c611324 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -65,7 +65,7 @@
#import "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h"
#include "ios/chrome/browser/notification_promo.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/prerender/prerender_pref.h"
#import "ios/chrome/browser/ui/authentication/signin/signin_coordinator.h"
#import "ios/chrome/browser/ui/authentication/signin_promo_view_mediator.h"
diff --git a/ios/chrome/browser/pref_names.cc b/ios/chrome/browser/prefs/pref_names.cc
similarity index 98%
rename from ios/chrome/browser/pref_names.cc
rename to ios/chrome/browser/prefs/pref_names.cc
index d4ee5fd..5f269eb 100644
--- a/ios/chrome/browser/pref_names.cc
+++ b/ios/chrome/browser/prefs/pref_names.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 "ios/chrome/browser/pref_names.h"
+#include "ios/chrome/browser/prefs/pref_names.h"
namespace prefs {
@@ -42,8 +42,7 @@
const char kContextualSearchEnabled[] = "search.contextual_search_enabled";
// Boolean that is true when Data Saver is enabled.
-// TODO(bengr): Migrate the preference string to "data_saver.enabled"
-// (crbug.com/564207).
+// TODO(crbug.com/1356134): Remove this pref
const char kDataSaverEnabled[] = "spdy_proxy.enabled";
// The default character encoding to assume for a web page in the
diff --git a/ios/chrome/browser/prefs/pref_names.h b/ios/chrome/browser/prefs/pref_names.h
index bdaf9cc5c..982936a 100644
--- a/ios/chrome/browser/prefs/pref_names.h
+++ b/ios/chrome/browser/prefs/pref_names.h
@@ -1,11 +1,71 @@
-// Copyright 2022 The Chromium Authors.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_PREFS_PREF_NAMES_H_
#define IOS_CHROME_BROWSER_PREFS_PREF_NAMES_H_
-// This is a temporary fix for downstream compatibility.
-#include "ios/chrome/browser/pref_names.h"
+namespace prefs {
+
+extern const char kApplicationLocale[];
+extern const char kArticlesForYouEnabled[];
+extern const char kBrowserStateInfoCache[];
+extern const char kBrowserStateLastUsed[];
+extern const char kBrowserStatesLastActive[];
+extern const char kBrowserStatesNumCreated[];
+extern const char kBrowsingDataMigrationHasBeenPossible[];
+extern const char kClearBrowsingDataHistoryNoticeShownTimes[];
+extern const char kContextualSearchEnabled[];
+extern const char kDataSaverEnabled[];
+extern const char kDefaultCharset[];
+extern const char kEnableDoNotTrack[];
+extern const char kFirstFollowUIShownCount[];
+extern const char kHttpServerProperties[];
+extern const char kIncognitoModeAvailability[];
+extern const char kIncognitoInterstitialEnabled[];
+extern const char kIosBookmarkCachedFolderId[];
+extern const char kIosBookmarkCachedTopMostRow[];
+extern const char kIosBookmarkFolderDefault[];
+extern const char kIosBookmarkPromoAlreadySeen[];
+extern const char kIosBookmarkSigninPromoDisplayedCount[];
+extern const char kIosShareChromeCount[];
+extern const char kIosShareChromeLastShare[];
+extern const char kIosDiscoverFeedLastRefreshTime[];
+extern const char kIosPromosManagerActivePromos[];
+extern const char kIosPromosManagerImpressions[];
+extern const char kIosSettingsPromoAlreadySeen[];
+extern const char kIosSettingsSigninPromoDisplayedCount[];
+extern const char kIosNtpFeedTopPromoAlreadySeen[];
+extern const char kIosNtpFeedTopSigninPromoDisplayedCount[];
+extern const char kLinkPreviewEnabled[];
+extern const char kNTPContentSuggestionsEnabled[];
+extern const char kNTPFollowingFeedSortType[];
+extern const char kOverflowMenuDestinationUsageHistory[];
+extern const char kPrintingEnabled[];
+extern const char kSearchSuggestEnabled[];
+extern const char kTrackPricesOnTabsEnabled[];
+
+extern const char kNetworkPredictionSetting[];
+
+extern const char kNtpShownBookmarksFolder[];
+extern const char kShowMemoryDebuggingTools[];
+
+extern const char kSigninLastAccounts[];
+extern const char kSigninLastAccountsMigrated[];
+extern const char kSigninShouldPromptForSigninAgain[];
+extern const char kSigninWebSignDismissalCount[];
+
+extern const char kIosUserZoomMultipliers[];
+
+extern const char kIncognitoAuthenticationSetting[];
+
+extern const char kBrowserSigninPolicy[];
+extern const char kAllowChromeDataInBackups[];
+
+extern const char kNewTabPageLocationOverride[];
+
+extern const char kHttpsOnlyModeEnabled[];
+
+} // namespace prefs
#endif // IOS_CHROME_BROWSER_PREFS_PREF_NAMES_H_
diff --git a/ios/chrome/browser/prerender/BUILD.gn b/ios/chrome/browser/prerender/BUILD.gn
index 4f9d5cf..bad22b3 100644
--- a/ios/chrome/browser/prerender/BUILD.gn
+++ b/ios/chrome/browser/prerender/BUILD.gn
@@ -11,7 +11,7 @@
"//base",
"//components/pref_registry",
"//components/prefs",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
]
}
diff --git a/ios/chrome/browser/prerender/preload_controller.mm b/ios/chrome/browser/prerender/preload_controller.mm
index fe57272..c29c2399 100644
--- a/ios/chrome/browser/prerender/preload_controller.mm
+++ b/ios/chrome/browser/prerender/preload_controller.mm
@@ -21,7 +21,7 @@
#include "ios/chrome/browser/download/mime_type_util.h"
#import "ios/chrome/browser/history/history_tab_helper.h"
#import "ios/chrome/browser/itunes_urls/itunes_urls_handler_tab_helper.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/prerender/preload_controller_delegate.h"
#import "ios/chrome/browser/prerender/prerender_pref.h"
#import "ios/chrome/browser/signin/account_consistency_service_factory.h"
diff --git a/ios/chrome/browser/prerender/preload_controller_unittest.mm b/ios/chrome/browser/prerender/preload_controller_unittest.mm
index fe506f1..7949cfe 100644
--- a/ios/chrome/browser/prerender/preload_controller_unittest.mm
+++ b/ios/chrome/browser/prerender/preload_controller_unittest.mm
@@ -9,7 +9,7 @@
#include "base/strings/sys_string_conversions.h"
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/prerender/preload_controller.h"
#import "ios/chrome/browser/prerender/prerender_pref.h"
#include "ios/web/public/test/web_task_environment.h"
diff --git a/ios/chrome/browser/prerender/prerender_pref.mm b/ios/chrome/browser/prerender/prerender_pref.mm
index d33b301f..202c7db 100644
--- a/ios/chrome/browser/prerender/prerender_pref.mm
+++ b/ios/chrome/browser/prerender/prerender_pref.mm
@@ -6,7 +6,7 @@
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
diff --git a/ios/chrome/browser/promos_manager/BUILD.gn b/ios/chrome/browser/promos_manager/BUILD.gn
index 50840df..1ad17a51 100644
--- a/ios/chrome/browser/promos_manager/BUILD.gn
+++ b/ios/chrome/browser/promos_manager/BUILD.gn
@@ -15,7 +15,7 @@
":types",
"//base",
"//components/prefs",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//third_party/abseil-cpp:absl",
]
}
@@ -81,7 +81,7 @@
"//base/test:test_support",
"//components/prefs",
"//components/prefs:test_support",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//testing/gmock",
"//testing/gtest",
"//third_party/abseil-cpp:absl",
diff --git a/ios/chrome/browser/promos_manager/promos_manager.mm b/ios/chrome/browser/promos_manager/promos_manager.mm
index b3e3ecd..a3056b0 100644
--- a/ios/chrome/browser/promos_manager/promos_manager.mm
+++ b/ios/chrome/browser/promos_manager/promos_manager.mm
@@ -16,7 +16,7 @@
#import "base/time/time.h"
#import "base/values.h"
#import "components/prefs/pref_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/promos_manager/constants.h"
#import "ios/chrome/browser/promos_manager/features.h"
#import "ios/chrome/browser/promos_manager/impression_limit.h"
diff --git a/ios/chrome/browser/promos_manager/promos_manager_unittest.mm b/ios/chrome/browser/promos_manager/promos_manager_unittest.mm
index 516cb61..526bbdd6 100644
--- a/ios/chrome/browser/promos_manager/promos_manager_unittest.mm
+++ b/ios/chrome/browser/promos_manager/promos_manager_unittest.mm
@@ -10,7 +10,7 @@
#import "base/test/scoped_feature_list.h"
#import "components/prefs/pref_registry_simple.h"
#import "components/prefs/testing_pref_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/promos_manager/constants.h"
#import "ios/chrome/browser/promos_manager/features.h"
#import "ios/chrome/browser/promos_manager/impression_limit.h"
diff --git a/ios/chrome/browser/signin/authentication_service.mm b/ios/chrome/browser/signin/authentication_service.mm
index 5f52db5e..17f3c63 100644
--- a/ios/chrome/browser/signin/authentication_service.mm
+++ b/ios/chrome/browser/signin/authentication_service.mm
@@ -25,7 +25,7 @@
#import "ios/chrome/browser/application_context/application_context.h"
#include "ios/chrome/browser/crash_report/crash_keys_helper.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_delegate.h"
#import "ios/chrome/browser/signin/authentication_service_observer.h"
#import "ios/chrome/browser/signin/signin_util.h"
diff --git a/ios/chrome/browser/signin/authentication_service_unittest.mm b/ios/chrome/browser/signin/authentication_service_unittest.mm
index 328402d..d19f95dc 100644
--- a/ios/chrome/browser/signin/authentication_service_unittest.mm
+++ b/ios/chrome/browser/signin/authentication_service_unittest.mm
@@ -29,8 +29,8 @@
#include "ios/chrome/browser/content_settings/cookie_settings_factory.h"
#include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_delegate_fake.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
diff --git a/ios/chrome/browser/signin/user_approved_account_list_manager.mm b/ios/chrome/browser/signin/user_approved_account_list_manager.mm
index c18a52f..d1f7cd87 100644
--- a/ios/chrome/browser/signin/user_approved_account_list_manager.mm
+++ b/ios/chrome/browser/signin/user_approved_account_list_manager.mm
@@ -5,7 +5,7 @@
#import "ios/chrome/browser/signin/user_approved_account_list_manager.h"
#import "components/prefs/pref_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
diff --git a/ios/chrome/browser/signin/user_approved_account_list_manager_unittest.mm b/ios/chrome/browser/signin/user_approved_account_list_manager_unittest.mm
index 97a6114..7012a6a 100644
--- a/ios/chrome/browser/signin/user_approved_account_list_manager_unittest.mm
+++ b/ios/chrome/browser/signin/user_approved_account_list_manager_unittest.mm
@@ -7,8 +7,8 @@
#import "components/sync_preferences/pref_service_mock_factory.h"
#import "components/sync_preferences/pref_service_syncable.h"
#import "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#import "ios/chrome/browser/pref_names.h"
#import "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/web/public/test/web_task_environment.h"
#import "testing/platform_test.h"
diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.mm b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
index 67be277..b4c68f5 100644
--- a/ios/chrome/browser/sync/ios_chrome_sync_client.mm
+++ b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
@@ -40,7 +40,7 @@
#include "ios/chrome/browser/history/history_service_factory.h"
#include "ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.h"
#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
#include "ios/chrome/browser/signin/identity_manager_factory.h"
diff --git a/ios/chrome/browser/ui/activity_services/BUILD.gn b/ios/chrome/browser/ui/activity_services/BUILD.gn
index 9980d20..a04bce3 100644
--- a/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -69,10 +69,10 @@
"//components/sync/driver:driver",
"//components/ui_metrics",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/bookmarks",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/download",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/snapshots",
"//ios/chrome/browser/snapshots:test_utils",
"//ios/chrome/browser/sync",
diff --git a/ios/chrome/browser/ui/activity_services/activity_service_mediator.mm b/ios/chrome/browser/ui/activity_services/activity_service_mediator.mm
index 0969ad6..fcf9acc 100644
--- a/ios/chrome/browser/ui/activity_services/activity_service_mediator.mm
+++ b/ios/chrome/browser/ui/activity_services/activity_service_mediator.mm
@@ -13,7 +13,7 @@
#include "base/strings/sys_string_conversions.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/prefs/pref_service.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/sync/send_tab_to_self_sync_service_factory.h"
#import "ios/chrome/browser/ui/activity_services/activities/bookmark_activity.h"
#import "ios/chrome/browser/ui/activity_services/activities/copy_activity.h"
diff --git a/ios/chrome/browser/ui/activity_services/activity_service_mediator_unittest.mm b/ios/chrome/browser/ui/activity_services/activity_service_mediator_unittest.mm
index a90de69..dac75f4 100644
--- a/ios/chrome/browser/ui/activity_services/activity_service_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/activity_services/activity_service_mediator_unittest.mm
@@ -9,7 +9,7 @@
#import "components/prefs/pref_registry_simple.h"
#import "components/prefs/pref_service.h"
#import "components/prefs/testing_pref_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/activity_services/activities/bookmark_activity.h"
#import "ios/chrome/browser/ui/activity_services/activities/copy_activity.h"
#import "ios/chrome/browser/ui/activity_services/activities/find_in_page_activity.h"
diff --git a/ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.mm b/ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.mm
index 80724f6..6c3627dc 100644
--- a/ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.mm
+++ b/ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.mm
@@ -12,7 +12,7 @@
#include "components/sync/driver/sync_service.h"
#import "ios/chrome/browser/application_context/application_context.h"
#include "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/sync/sync_service_factory.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/ios/chrome/browser/ui/authentication/signin/BUILD.gn
index ba60a8e..2a99eeaf 100644
--- a/ios/chrome/browser/ui/authentication/signin/BUILD.gn
+++ b/ios/chrome/browser/ui/authentication/signin/BUILD.gn
@@ -52,9 +52,9 @@
"//components/signin/ios/browser",
"//ios/chrome/app:tests_hook",
"//ios/chrome/browser",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/main:public",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin",
"//ios/chrome/browser/sync",
"//ios/chrome/browser/ui:feature_flags",
@@ -83,11 +83,11 @@
"//components/sync/base",
"//components/sync_preferences",
"//components/sync_preferences:test_support",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/main:test_support",
"//ios/chrome/browser/policy:policy_util",
"//ios/chrome/browser/prefs:browser_prefs",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin",
"//ios/chrome/browser/signin:test_support",
"//ios/chrome/browser/ui/authentication/signin:signin_headers",
@@ -127,10 +127,10 @@
"//components/signin/public/base",
"//components/strings:components_strings_grit",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/metrics:eg_test_support+eg2",
"//ios/chrome/browser/policy:eg_test_support+eg2",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
"//ios/chrome/browser/ui/authentication/views:views_constants",
"//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2",
diff --git a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn
index ea99709..77d3d85b 100644
--- a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn
+++ b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn
@@ -17,10 +17,10 @@
"//components/prefs",
"//components/signin/public/identity_manager/objc",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/main:public",
"//ios/chrome/browser/net:crurl",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin",
"//ios/chrome/browser/ui/alert_coordinator",
"//ios/chrome/browser/ui/authentication",
@@ -57,8 +57,8 @@
"//components/signin/public/identity_manager",
"//components/signin/public/identity_manager/objc",
"//components/sync_preferences:test_support",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/signin",
"//ios/chrome/browser/signin:test_support",
"//ios/chrome/test:test_support",
@@ -81,7 +81,7 @@
"//base",
"//base/test:test_support",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
"//ios/chrome/browser/ui/authentication/signin:constants",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
diff --git a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator.mm b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator.mm
index 3af165d..2b410ba 100644
--- a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator.mm
+++ b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator.mm
@@ -9,7 +9,7 @@
#import "components/signin/public/base/signin_metrics.h"
#import "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/main/browser.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
#import "ios/chrome/browser/signin/constants.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm
index 3b07d5d..6f919f7 100644
--- a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm
+++ b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#import "base/test/ios/wait_util.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/authentication/signin/signin_constants.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator.mm b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator.mm
index b844570..880c52d 100644
--- a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator.mm
+++ b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator.mm
@@ -10,7 +10,7 @@
#import "components/signin/public/base/signin_metrics.h"
#import "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
#import "components/signin/public/identity_manager/objc/identity_manager_observer_bridge.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service.h"
#import "ios/chrome/browser/ui/authentication/signin/signin_completion_info.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm
index 4abfaef..5ed434d9 100644
--- a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm
@@ -12,7 +12,7 @@
#import "components/signin/public/identity_manager/objc/identity_manager_observer_bridge.h"
#import "components/sync_preferences/testing_pref_service_syncable.h"
#import "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn b/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn
index d3f1476..1b5ac6a 100644
--- a/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn
+++ b/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn
@@ -40,9 +40,9 @@
"//components/signin/ios/browser:features",
"//ios/chrome/app/strings:ios_chromium_strings_grit",
"//ios/chrome/app/strings:ios_strings_grit",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/policy:eg_test_support+eg2",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
"//ios/chrome/browser/ui/authentication/signin:constants",
diff --git a/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm b/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm
index e42e264e7..6924024 100644
--- a/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm
+++ b/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm
@@ -10,7 +10,7 @@
#include "components/signin/ios/browser/features.h"
#import "ios/chrome/browser/policy/policy_earl_grey_utils.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui_test_util.h"
#import "ios/chrome/browser/ui/authentication/signin_matchers.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/signin_coordinator.mm b/ios/chrome/browser/ui/authentication/signin/signin_coordinator.mm
index cca29d3..5901ed8 100644
--- a/ios/chrome/browser/ui/authentication/signin/signin_coordinator.mm
+++ b/ios/chrome/browser/ui/authentication/signin/signin_coordinator.mm
@@ -10,7 +10,7 @@
#import "components/signin/public/base/signin_metrics.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/main/browser.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/signin_coordinator_egtest.mm b/ios/chrome/browser/ui/authentication/signin/signin_coordinator_egtest.mm
index f42f2a7e..fe3bf43 100644
--- a/ios/chrome/browser/ui/authentication/signin/signin_coordinator_egtest.mm
+++ b/ios/chrome/browser/ui/authentication/signin/signin_coordinator_egtest.mm
@@ -14,7 +14,7 @@
#import "ios/chrome/browser/metrics/metrics_app_interface.h"
#import "ios/chrome/browser/policy/policy_earl_grey_utils.h"
#include "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui_test_util.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/signin_utils.mm b/ios/chrome/browser/ui/authentication/signin/signin_utils.mm
index b994ce5..c6d3fd1 100644
--- a/ios/chrome/browser/ui/authentication/signin/signin_utils.mm
+++ b/ios/chrome/browser/ui/authentication/signin/signin_utils.mm
@@ -18,7 +18,7 @@
#import "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm b/ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm
index de496c0..ed30216 100644
--- a/ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm
+++ b/ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm
@@ -18,8 +18,8 @@
#import "components/sync_preferences/pref_service_syncable.h"
#import "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
#import "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
diff --git a/ios/chrome/browser/ui/authentication/signin_promo_view_mediator.mm b/ios/chrome/browser/ui/authentication/signin_promo_view_mediator.mm
index ce2e837..011158a 100644
--- a/ios/chrome/browser/ui/authentication/signin_promo_view_mediator.mm
+++ b/ios/chrome/browser/ui/authentication/signin_promo_view_mediator.mm
@@ -14,7 +14,7 @@
#import "components/prefs/pref_service.h"
#import "components/signin/public/base/signin_metrics.h"
#import "ios/chrome/browser/discover_feed/feed_constants.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_observer_bridge.h"
diff --git a/ios/chrome/browser/ui/authentication/signin_promo_view_mediator_unittest.mm b/ios/chrome/browser/ui/authentication/signin_promo_view_mediator_unittest.mm
index 5e20756..eb6a06f3 100644
--- a/ios/chrome/browser/ui/authentication/signin_promo_view_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/authentication/signin_promo_view_mediator_unittest.mm
@@ -15,8 +15,8 @@
#import "components/sync_preferences/pref_service_syncable.h"
#import "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
#import "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
diff --git a/ios/chrome/browser/ui/authentication/signout_action_sheet_coordinator_unittest.mm b/ios/chrome/browser/ui/authentication/signout_action_sheet_coordinator_unittest.mm
index 1659c408..482d536 100644
--- a/ios/chrome/browser/ui/authentication/signout_action_sheet_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/authentication/signout_action_sheet_coordinator_unittest.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/main/test_browser.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
#include "ios/chrome/browser/sync/sync_service_factory.h"
diff --git a/ios/chrome/browser/ui/bookmarks/BUILD.gn b/ios/chrome/browser/ui/bookmarks/BUILD.gn
index 9fb924c..2959df6 100644
--- a/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -119,11 +119,11 @@
"//components/strings",
"//components/undo",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser:utils",
"//ios/chrome/browser/bookmarks",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/main:public",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/default_promo:utils",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/ui/util:url_with_title",
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm b/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm
index 9d6d20f3..675660f 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm
@@ -13,7 +13,7 @@
#include "components/query_parser/query_parser.h"
#include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h"
#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
#import "ios/chrome/test/app/chrome_test_util.h"
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm
index 5a35f08..8c9ce6b 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm
@@ -16,7 +16,7 @@
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
#import "ios/chrome/browser/ui/default_promo/default_browser_utils.h"
#include "ios/chrome/browser/ui/util/uikit_ui_util.h"
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.mm b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.mm
index 2f73ce25..0912fff 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.mm
@@ -8,7 +8,7 @@
#include "components/bookmarks/browser/bookmark_node.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/browser_view/BUILD.gn b/ios/chrome/browser/ui/browser_view/BUILD.gn
index 0add096..ce7763ab 100644
--- a/ios/chrome/browser/ui/browser_view/BUILD.gn
+++ b/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -325,8 +325,8 @@
"//base/test:test_support",
"//components/strings",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/ntp:features",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/content_suggestions:constants",
"//ios/chrome/browser/ui/content_suggestions:feature_flags",
diff --git a/ios/chrome/browser/ui/browser_view/browser_view_controller_egtest.mm b/ios/chrome/browser/ui/browser_view/browser_view_controller_egtest.mm
index 9c06521..893fc0680 100644
--- a/ios/chrome/browser/ui/browser_view/browser_view_controller_egtest.mm
+++ b/ios/chrome/browser/ui/browser_view/browser_view_controller_egtest.mm
@@ -9,7 +9,7 @@
#import "base/ios/ios_util.h"
#include "base/strings/sys_string_conversions.h"
#include "components/strings/grit/components_strings.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_constants.h"
#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
#import "ios/chrome/browser/ui/start_surface/start_surface_features.h"
diff --git a/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index e6bcad6..eba5b36 100644
--- a/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -340,8 +340,8 @@
"//components/feed/core/v2/public/ios:feed_ios_public",
"//components/strings",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser:utils",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
"//ios/chrome/browser/ui/content_suggestions/cells:constants",
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm
index 622ec0e..a1ff415 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm
@@ -25,7 +25,7 @@
#import "ios/chrome/browser/ntp/new_tab_page_tab_helper.h"
#include "ios/chrome/browser/ntp_tiles/ios_most_visited_sites_factory.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
index e4162e8c..1f2e810e 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
@@ -31,7 +31,7 @@
#import "ios/chrome/browser/ntp/new_tab_page_tab_helper.h"
#import "ios/chrome/browser/ntp_tiles/most_visited_sites_observer_bridge.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/ui/commands/application_commands.h"
diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm b/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm
index d9c391d..8dd8399d 100644
--- a/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm
+++ b/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm
@@ -9,7 +9,7 @@
#include "components/feed/core/v2/public/ios/pref_names.h"
#include "components/strings/grit/components_strings.h"
#include "ios/chrome/browser/chrome_switches.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui_test_util.h"
#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_cells_constants.h"
diff --git a/ios/chrome/browser/ui/context_menu/BUILD.gn b/ios/chrome/browser/ui/context_menu/BUILD.gn
index c08d5903..9847fd8 100644
--- a/ios/chrome/browser/ui/context_menu/BUILD.gn
+++ b/ios/chrome/browser/ui/context_menu/BUILD.gn
@@ -14,10 +14,10 @@
"//components/search_engines",
"//components/url_param_filter/core",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/favicon",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/search_engines",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/alert_coordinator",
diff --git a/ios/chrome/browser/ui/context_menu/context_menu_configuration_provider.mm b/ios/chrome/browser/ui/context_menu/context_menu_configuration_provider.mm
index c3646f7..6b11ea4 100644
--- a/ios/chrome/browser/ui/context_menu/context_menu_configuration_provider.mm
+++ b/ios/chrome/browser/ui/context_menu/context_menu_configuration_provider.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/browser/favicon/ios_chrome_favicon_loader_factory.h"
#import "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/search_engines/search_engines_util.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h"
diff --git a/ios/chrome/browser/ui/incognito_interstitial/BUILD.gn b/ios/chrome/browser/ui/incognito_interstitial/BUILD.gn
index 4b89df3..4eae72a 100644
--- a/ios/chrome/browser/ui/incognito_interstitial/BUILD.gn
+++ b/ios/chrome/browser/ui/incognito_interstitial/BUILD.gn
@@ -65,9 +65,9 @@
sources = [ "incognito_interstitial_egtest.mm" ]
deps = [
"//components/policy:generated",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/policy:eg_test_support+eg2",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/test:eg_test_support+eg2",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
diff --git a/ios/chrome/browser/ui/incognito_interstitial/incognito_interstitial_egtest.mm b/ios/chrome/browser/ui/incognito_interstitial/incognito_interstitial_egtest.mm
index aeda6b7d..54656b3 100644
--- a/ios/chrome/browser/ui/incognito_interstitial/incognito_interstitial_egtest.mm
+++ b/ios/chrome/browser/ui/incognito_interstitial/incognito_interstitial_egtest.mm
@@ -7,7 +7,7 @@
#import "ios/chrome/browser/policy/policy_earl_grey_utils.h"
#import "ios/chrome/browser/policy/policy_util.h"
#import "ios/chrome/browser/policy/scoped_policy_list.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/ui_feature_flags.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_matchers.h"
diff --git a/ios/chrome/browser/ui/incognito_reauth/BUILD.gn b/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
index 38416f1..b1b853d 100644
--- a/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
+++ b/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
@@ -63,7 +63,7 @@
"//components/prefs",
"//ios/chrome/app/strings:ios_strings_grit",
"//ios/chrome/browser",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/main:browser_interface_provider",
"//ios/chrome/browser/ui/main:observing_scene_agent",
@@ -84,9 +84,9 @@
"//base",
"//base/test:test_support",
"//components/prefs:test_support",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/main:test_support",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/browser_view",
"//ios/chrome/browser/ui/main:browser_interface_provider",
diff --git a/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.mm b/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.mm
index be579476..d374767 100644
--- a/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.mm
+++ b/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.mm
@@ -15,7 +15,7 @@
#include "components/prefs/pref_service.h"
#import "ios/chrome/browser/application_context/application_context.h"
#import "ios/chrome/browser/main/browser.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_util.h"
#import "ios/chrome/browser/ui/main/browser_interface_provider.h"
#import "ios/chrome/browser/ui/ui_feature_flags.h"
diff --git a/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent_unittest.mm b/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent_unittest.mm
index f4e30e6..50646d24 100644
--- a/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent_unittest.mm
+++ b/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent_unittest.mm
@@ -9,7 +9,7 @@
#include "components/prefs/testing_pref_service.h"
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/main/test_browser.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/main/browser_interface_provider.h"
#import "ios/chrome/browser/ui/main/test/stub_browser_interface_provider.h"
#import "ios/chrome/browser/ui/ui_feature_flags.h"
diff --git a/ios/chrome/browser/ui/location_bar/location_bar_model_delegate_ios.mm b/ios/chrome/browser/ui/location_bar/location_bar_model_delegate_ios.mm
index 468792b4..818801d 100644
--- a/ios/chrome/browser/ui/location_bar/location_bar_model_delegate_ios.mm
+++ b/ios/chrome/browser/ui/location_bar/location_bar_model_delegate_ios.mm
@@ -13,7 +13,7 @@
#include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/chrome_url_constants.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/reading_list/offline_page_tab_helper.h"
#include "ios/chrome/browser/web_state_list/web_state_list.h"
#import "ios/components/security_interstitials/ios_blocking_page_tab_helper.h"
diff --git a/ios/chrome/browser/ui/main/scene_controller.mm b/ios/chrome/browser/ui/main/scene_controller.mm
index 3d8161bd..5c9514be 100644
--- a/ios/chrome/browser/ui/main/scene_controller.mm
+++ b/ios/chrome/browser/ui/main/scene_controller.mm
@@ -67,7 +67,7 @@
#import "ios/chrome/browser/policy/policy_watcher_browser_agent.h"
#include "ios/chrome/browser/policy/policy_watcher_browser_agent.h"
#import "ios/chrome/browser/policy/policy_watcher_browser_agent_observer_bridge.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/promos_manager/features.h"
#import "ios/chrome/browser/promos_manager/promos_manager_scene_agent.h"
#include "ios/chrome/browser/screenshot/screenshot_delegate.h"
diff --git a/ios/chrome/browser/ui/menu/BUILD.gn b/ios/chrome/browser/ui/menu/BUILD.gn
index 16f1a77..a0b11c1 100644
--- a/ios/chrome/browser/ui/menu/BUILD.gn
+++ b/ios/chrome/browser/ui/menu/BUILD.gn
@@ -41,9 +41,9 @@
"//components/search_engines",
"//components/url_param_filter/core",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/search_engines",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/commands",
diff --git a/ios/chrome/browser/ui/menu/browser_action_factory.mm b/ios/chrome/browser/ui/menu/browser_action_factory.mm
index 81a4aa8..83d84ca 100644
--- a/ios/chrome/browser/ui/menu/browser_action_factory.mm
+++ b/ios/chrome/browser/ui/menu/browser_action_factory.mm
@@ -10,7 +10,7 @@
#include "components/search_engines/template_url_service.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/search_engines/template_url_service_factory.h"
#import "ios/chrome/browser/ui/commands/application_commands.h"
#import "ios/chrome/browser/ui/commands/browser_coordinator_commands.h"
diff --git a/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm b/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm
index 303e738..ccaeb26 100644
--- a/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm
+++ b/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm
@@ -11,7 +11,7 @@
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/main/test_browser.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/sessions/test_session_service.h"
#import "ios/chrome/browser/ui/commands/application_commands.h"
#import "ios/chrome/browser/ui/commands/browser_coordinator_commands.h"
diff --git a/ios/chrome/browser/ui/ntp/BUILD.gn b/ios/chrome/browser/ui/ntp/BUILD.gn
index a8421701..b1d0196 100644
--- a/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -63,7 +63,6 @@
"//ios/chrome/app:tests_hook",
"//ios/chrome/app/application_delegate:app_state_header",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/discover_feed",
"//ios/chrome/browser/discover_feed:discover_feed_factory",
@@ -72,6 +71,7 @@
"//ios/chrome/browser/main:public",
"//ios/chrome/browser/ntp",
"//ios/chrome/browser/ntp:features",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/reading_list",
"//ios/chrome/browser/search_engines",
"//ios/chrome/browser/signin",
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
index 88634bd0..60845c9 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
@@ -30,7 +30,7 @@
#import "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/ntp/features.h"
#import "ios/chrome/browser/ntp/new_tab_page_tab_helper.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/reading_list/reading_list_model_factory.h"
#import "ios/chrome/browser/search_engines/template_url_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service.h"
diff --git a/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm b/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm
index 65645830..de049b8e 100644
--- a/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm
+++ b/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm
@@ -23,7 +23,7 @@
#include "components/metrics/metrics_pref_names.h"
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/notification_promo.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/system_flags.h"
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
diff --git a/ios/chrome/browser/ui/policy/signin_policy_scene_agent.mm b/ios/chrome/browser/ui/policy/signin_policy_scene_agent.mm
index 6f88da9..0e3ccf7 100644
--- a/ios/chrome/browser/ui/policy/signin_policy_scene_agent.mm
+++ b/ios/chrome/browser/ui/policy/signin_policy_scene_agent.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/browser/policy/policy_util.h"
#import "ios/chrome/browser/policy/policy_watcher_browser_agent.h"
#import "ios/chrome/browser/policy/policy_watcher_browser_agent_observer_bridge.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/identity_manager_factory.h"
diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn b/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
index 1c059f9..cb6d984 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
@@ -70,7 +70,6 @@
"//components/translate/core/browser",
"//ios/chrome/app/strings:ios_strings_grit",
"//ios/chrome/browser:chrome_url_constants",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/find_in_page",
"//ios/chrome/browser/follow:browser_agent",
@@ -81,6 +80,7 @@
"//ios/chrome/browser/overlays",
"//ios/chrome/browser/policy",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/reading_list",
"//ios/chrome/browser/translate",
"//ios/chrome/browser/ui/activity_services",
@@ -174,7 +174,6 @@
"//components/prefs",
"//components/prefs:test_support",
"//components/translate/core/browser",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/bookmarks",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/main:test_support",
@@ -183,6 +182,7 @@
"//ios/chrome/browser/overlays/test",
"//ios/chrome/browser/passwords:store_factory",
"//ios/chrome/browser/policy:test_support",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/popup_menu:constants",
"//ios/chrome/browser/ui/toolbar/test",
diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
index 2baaa5f..1aa82a8 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
@@ -8,7 +8,7 @@
deps = [
"//base",
"//components/prefs",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_constants",
"//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_swift",
]
@@ -22,7 +22,7 @@
"//base",
"//components/prefs",
"//components/prefs:test_support",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_constants",
"//testing/gmock",
"//testing/gtest",
@@ -39,7 +39,7 @@
sources = [ "destination_usage_history_egtest.mm" ]
deps = [
":destination_usage_history",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/popup_menu:constants",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/testing/earl_grey:eg_test_support+eg2",
diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.mm b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.mm
index f7245c5..e29eac9 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.mm
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.mm
@@ -9,7 +9,7 @@
#include "base/time/time.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_constants.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_egtest.mm b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_egtest.mm
index 40c398b8..f4e52813 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_egtest.mm
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_egtest.mm
@@ -6,7 +6,7 @@
#import <XCTest/XCTest.h>
#include "base/ios/ios_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm
index b13c77f..6026819 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm
@@ -8,7 +8,7 @@
#include "base/values.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_constants.h"
#include "testing/platform_test.h"
diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator_unittest.mm b/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator_unittest.mm
index aea0b04..5719e93 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator_unittest.mm
@@ -31,7 +31,7 @@
#include "ios/chrome/browser/overlays/test/fake_overlay_presentation_context.h"
#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
#include "ios/chrome/browser/policy/enterprise_policy_test_helper.h"
-#import "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_swift.h"
#import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
#import "ios/chrome/browser/ui/toolbar/test/toolbar_test_navigation_manager.h"
diff --git a/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn b/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn
index 8ac314cf..1f280ae 100644
--- a/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn
@@ -15,9 +15,9 @@
"//components/prefs",
"//components/prefs/ios",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/net:crurl",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/prerender:prerender_pref",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/settings:constants",
@@ -47,9 +47,9 @@
"//components/sync_preferences",
"//components/sync_preferences:test_support",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/prefs:browser_prefs",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/prerender:prerender_pref",
"//ios/chrome/browser/ui/table_view",
"//ios/chrome/browser/ui/table_view:test_support",
diff --git a/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller.mm b/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller.mm
index 1f7e5e2..3963ba6 100644
--- a/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller.mm
@@ -12,7 +12,7 @@
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/net/crurl.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/settings/bandwidth/dataplan_usage_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/settings_table_view_controller_constants.h"
#import "ios/chrome/browser/ui/table_view/cells/table_view_detail_icon_item.h"
diff --git a/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller_unittest.mm
index bd32150..e7bb4a9 100644
--- a/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/bandwidth/bandwidth_management_table_view_controller_unittest.mm
@@ -14,8 +14,8 @@
#include "components/sync_preferences/pref_service_mock_factory.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/settings/bandwidth/dataplan_usage_table_view_controller.h"
#import "ios/chrome/browser/ui/table_view/chrome_table_view_controller_test.h"
#import "ios/chrome/browser/ui/table_view/table_view_model.h"
diff --git a/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager_unittest.mm b/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager_unittest.mm
index 9211c12..a9add44f 100644
--- a/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager_unittest.mm
+++ b/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager_unittest.mm
@@ -22,8 +22,8 @@
#import "ios/chrome/browser/browsing_data/cache_counter.h"
#import "ios/chrome/browser/browsing_data/fake_browsing_data_remover.h"
#import "ios/chrome/browser/net/crurl.h"
-#import "ios/chrome/browser/pref_names.h"
#import "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/search_engines/template_url_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_delegate_fake.h"
diff --git a/ios/chrome/browser/ui/settings/content_settings/BUILD.gn b/ios/chrome/browser/ui/settings/content_settings/BUILD.gn
index 3567d03..27916a4f 100644
--- a/ios/chrome/browser/ui/settings/content_settings/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/content_settings/BUILD.gn
@@ -22,13 +22,13 @@
"//components/prefs",
"//components/strings",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/content_settings",
"//ios/chrome/browser/mailto_handler",
"//ios/chrome/browser/mailto_handler:mailto_handler_factory",
"//ios/chrome/browser/main:public",
"//ios/chrome/browser/net:crurl",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/coordinators:chrome_coordinators",
"//ios/chrome/browser/ui/ntp:feature_flags",
diff --git a/ios/chrome/browser/ui/settings/content_settings/content_settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/content_settings/content_settings_table_view_controller.mm
index 7d42f26..52bf9b8b 100644
--- a/ios/chrome/browser/ui/settings/content_settings/content_settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/content_settings/content_settings_table_view_controller.mm
@@ -18,7 +18,7 @@
#import "ios/chrome/browser/mailto_handler/mailto_handler_service.h"
#import "ios/chrome/browser/mailto_handler/mailto_handler_service_factory.h"
#import "ios/chrome/browser/main/browser.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
#import "ios/chrome/browser/ui/settings/content_settings/block_popups_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/content_settings/default_page_mode_coordinator.h"
diff --git a/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/ios/chrome/browser/ui/settings/google_services/BUILD.gn
index 0ff1d5f..bac5e1b7 100644
--- a/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -156,8 +156,8 @@
"//components/signin/public/base",
"//components/strings",
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/policy:policy_util",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
"//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2",
diff --git a/ios/chrome/browser/ui/settings/google_services/google_services_settings_egtest.mm b/ios/chrome/browser/ui/settings/google_services/google_services_settings_egtest.mm
index 02503f6..01c5265 100644
--- a/ios/chrome/browser/ui/settings/google_services/google_services_settings_egtest.mm
+++ b/ios/chrome/browser/ui/settings/google_services/google_services_settings_egtest.mm
@@ -13,7 +13,7 @@
#include "components/signin/public/base/signin_pref_names.h"
#include "components/signin/public/base/signin_switches.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui_test_util.h"
#import "ios/chrome/browser/ui/authentication/signin_matchers.h"
diff --git a/ios/chrome/browser/ui/settings/google_services/google_services_settings_mediator.mm b/ios/chrome/browser/ui/settings/google_services/google_services_settings_mediator.mm
index a32cc8b..b9758de2 100644
--- a/ios/chrome/browser/ui/settings/google_services/google_services_settings_mediator.mm
+++ b/ios/chrome/browser/ui/settings/google_services/google_services_settings_mediator.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/browser/application_context/application_context.h"
#import "ios/chrome/browser/commerce/price_alert_util.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service.h"
diff --git a/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm b/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm
index d5167c1b..b9d628b2 100644
--- a/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm
+++ b/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm
@@ -13,7 +13,7 @@
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#import "ios/chrome/browser/application_context/application_context.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/icons/chrome_symbol.h"
#import "ios/chrome/browser/ui/list_model/list_model.h"
#import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_item.h"
diff --git a/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller.mm b/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller.mm
index 0262a5c..b11e1a0 100644
--- a/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller.mm
@@ -26,7 +26,7 @@
#import "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/net/crurl.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/sync/sync_service_factory.h"
#import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
#import "ios/chrome/browser/ui/incognito_interstitial/incognito_interstitial_constants.h"
diff --git a/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller_unittest.mm
index 319236db..4f01201 100644
--- a/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/privacy/privacy_table_view_controller_unittest.mm
@@ -24,8 +24,8 @@
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/main/test_browser.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/sync/sync_service_factory.h"
#include "ios/chrome/browser/system_flags.h"
#import "ios/chrome/browser/ui/table_view/chrome_table_view_controller_test.h"
diff --git a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
index 149d1d7..8944221 100644
--- a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
+++ b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
@@ -27,7 +27,7 @@
#include "ios/chrome/browser/passwords/ios_chrome_password_check_manager_factory.h"
#include "ios/chrome/browser/passwords/password_check_observer_bridge.h"
#include "ios/chrome/browser/passwords/password_store_observer_bridge.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#include "ios/chrome/browser/sync/sync_setup_service.h"
#import "ios/chrome/browser/ui/icons/chrome_symbol.h"
diff --git a/ios/chrome/browser/ui/settings/settings_app_interface.mm b/ios/chrome/browser/ui/settings/settings_app_interface.mm
index 785a1f4..d748e7ef 100644
--- a/ios/chrome/browser/ui/settings/settings_app_interface.mm
+++ b/ios/chrome/browser/ui/settings/settings_app_interface.mm
@@ -14,7 +14,7 @@
#import "ios/chrome/app/main_controller.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#import "ios/chrome/test/app/chrome_test_util.h"
#import "ios/chrome/test/app/tab_test_util.h"
diff --git a/ios/chrome/browser/ui/settings/settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
index c2e849ed..23fdec9 100644
--- a/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
@@ -38,7 +38,7 @@
#include "ios/chrome/browser/passwords/ios_chrome_password_check_manager_factory.h"
#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
#include "ios/chrome/browser/passwords/password_check_observer_bridge.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/search_engines/search_engine_observer_bridge.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service.h"
diff --git a/ios/chrome/browser/ui/settings/settings_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/settings_table_view_controller_unittest.mm
index f26791f..5be67d1 100644
--- a/ios/chrome/browser/ui/settings/settings_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/settings_table_view_controller_unittest.mm
@@ -16,7 +16,7 @@
#import "ios/chrome/browser/main/test_browser.h"
#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/search_engines/template_url_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/authentication_service_fake.h"
diff --git a/ios/chrome/browser/ui/settings/signin_settings_app_interface.mm b/ios/chrome/browser/ui/settings/signin_settings_app_interface.mm
index c2cb676..262d4cf3 100644
--- a/ios/chrome/browser/ui/settings/signin_settings_app_interface.mm
+++ b/ios/chrome/browser/ui/settings/signin_settings_app_interface.mm
@@ -6,7 +6,7 @@
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/test/app/chrome_test_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm
index 4d80c13..bac93ea 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm
@@ -20,7 +20,7 @@
#import "ios/chrome/browser/commerce/price_alert_util.h"
#include "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/policy/policy_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
#import "ios/chrome/browser/ui/activity_services/activity_params.h"
diff --git a/ios/chrome/browser/unified_consent/unified_consent_service_factory.mm b/ios/chrome/browser/unified_consent/unified_consent_service_factory.mm
index 00c195a..73c8a8b 100644
--- a/ios/chrome/browser/unified_consent/unified_consent_service_factory.mm
+++ b/ios/chrome/browser/unified_consent/unified_consent_service_factory.mm
@@ -15,7 +15,7 @@
#include "components/unified_consent/unified_consent_service.h"
#import "ios/chrome/browser/application_context/application_context.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/signin/identity_manager_factory.h"
#include "ios/chrome/browser/sync/sync_service_factory.h"
diff --git a/ios/chrome/browser/web/BUILD.gn b/ios/chrome/browser/web/BUILD.gn
index a418cb4a..ef76bcac 100644
--- a/ios/chrome/browser/web/BUILD.gn
+++ b/ios/chrome/browser/web/BUILD.gn
@@ -428,8 +428,8 @@
"//components/version_info:version_info",
"//ios/chrome/app/strings",
"//ios/chrome/browser:chrome_url_constants",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/metrics:eg_test_support+eg2",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui/infobars/banners:public",
"//ios/chrome/browser/ui/popup_menu:constants",
"//ios/chrome/browser/ui/start_surface:feature_flags",
diff --git a/ios/chrome/browser/web/font_size/BUILD.gn b/ios/chrome/browser/web/font_size/BUILD.gn
index deebb25..b6a2e930 100644
--- a/ios/chrome/browser/web/font_size/BUILD.gn
+++ b/ios/chrome/browser/web/font_size/BUILD.gn
@@ -20,8 +20,8 @@
"//components/prefs",
"//components/ukm/ios:ukm_url_recorder",
"//ios/chrome/browser",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/web:feature_flags",
"//ios/components/ui_util",
"//ios/public/provider/chrome/browser/text_zoom:text_zoom_api",
@@ -44,9 +44,9 @@
"//base/test:test_support",
"//components/sync_preferences",
"//components/sync_preferences:test_support",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/prefs:browser_prefs",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/web:feature_flags",
"//ios/chrome/test/fakes",
"//ios/public/provider/chrome/browser",
diff --git a/ios/chrome/browser/web/font_size/font_size_tab_helper.mm b/ios/chrome/browser/web/font_size/font_size_tab_helper.mm
index 2704e82c..f25646d1 100644
--- a/ios/chrome/browser/web/font_size/font_size_tab_helper.mm
+++ b/ios/chrome/browser/web/font_size/font_size_tab_helper.mm
@@ -19,7 +19,7 @@
#include "components/ukm/ios/ukm_url_recorder.h"
#import "ios/chrome/browser/application_context/application_context.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/web/features.h"
#import "ios/chrome/browser/web/font_size/font_size_java_script_feature.h"
#include "ios/components/ui_util/dynamic_type_util.h"
diff --git a/ios/chrome/browser/web/font_size/font_size_tab_helper_unittest.mm b/ios/chrome/browser/web/font_size/font_size_tab_helper_unittest.mm
index 13a28109..fe9e894 100644
--- a/ios/chrome/browser/web/font_size/font_size_tab_helper_unittest.mm
+++ b/ios/chrome/browser/web/font_size/font_size_tab_helper_unittest.mm
@@ -14,8 +14,8 @@
#include "components/sync_preferences/pref_service_mock_factory.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#include "ios/chrome/browser/web/features.h"
#import "ios/chrome/browser/web/font_size/font_size_java_script_feature.h"
#import "ios/web/public/test/fakes/fake_web_client.h"
diff --git a/ios/chrome/browser/web/print/BUILD.gn b/ios/chrome/browser/web/print/BUILD.gn
index bf219a4..57e1b65 100644
--- a/ios/chrome/browser/web/print/BUILD.gn
+++ b/ios/chrome/browser/web/print/BUILD.gn
@@ -17,8 +17,8 @@
":print_js",
"//base",
"//components/prefs",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/web/public",
"//ios/web/public/js_messaging",
]
@@ -38,9 +38,9 @@
"//base/test:test_support",
"//components/sync_preferences",
"//components/sync_preferences:test_support",
- "//ios/chrome/browser:pref_names",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/prefs:browser_prefs",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/test/fakes",
"//ios/web/public/test",
"//testing/gtest",
diff --git a/ios/chrome/browser/web/print/print_tab_helper.mm b/ios/chrome/browser/web/print/print_tab_helper.mm
index a4dfbba..6b02415 100644
--- a/ios/chrome/browser/web/print/print_tab_helper.mm
+++ b/ios/chrome/browser/web/print/print_tab_helper.mm
@@ -6,7 +6,7 @@
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/web/print/web_state_printer.h"
#import "ios/web/public/browser_state.h"
diff --git a/ios/chrome/browser/web/print/print_tab_helper_unittest.mm b/ios/chrome/browser/web/print/print_tab_helper_unittest.mm
index 5a7bc8e..21c80f0e 100644
--- a/ios/chrome/browser/web/print/print_tab_helper_unittest.mm
+++ b/ios/chrome/browser/web/print/print_tab_helper_unittest.mm
@@ -8,8 +8,8 @@
#include "components/sync_preferences/pref_service_mock_factory.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/prefs/browser_prefs.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/web/print/web_state_printer.h"
#import "ios/web/public/test/fakes/fake_web_state.h"
#import "ios/web/public/web_state.h"
diff --git a/ios/chrome/test/app/signin_test_util.mm b/ios/chrome/test/app/signin_test_util.mm
index f5419dde..c373dd3 100644
--- a/ios/chrome/test/app/signin_test_util.mm
+++ b/ios/chrome/test/app/signin_test_util.mm
@@ -12,7 +12,7 @@
#import "components/sync/driver/sync_user_settings.h"
#include "google_apis/gaia/gaia_constants.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/signin/authentication_service.h"
#include "ios/chrome/browser/signin/authentication_service_factory.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service.h"
diff --git a/ios/chrome/test/earl_grey2/BUILD.gn b/ios/chrome/test/earl_grey2/BUILD.gn
index 04cd075..7356f7ed 100644
--- a/ios/chrome/test/earl_grey2/BUILD.gn
+++ b/ios/chrome/test/earl_grey2/BUILD.gn
@@ -237,7 +237,7 @@
deps = [
"//ios/chrome/app/strings",
- "//ios/chrome/browser:pref_names",
+ "//ios/chrome/browser/prefs:pref_names",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/settings/password:password_constants",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
diff --git a/ios/chrome/test/earl_grey2/smoke_egtest.mm b/ios/chrome/test/earl_grey2/smoke_egtest.mm
index 72f5720b..485dbca 100644
--- a/ios/chrome/test/earl_grey2/smoke_egtest.mm
+++ b/ios/chrome/test/earl_grey2/smoke_egtest.mm
@@ -6,7 +6,7 @@
#import <UIKit/UIKit.h>
#import "base/ios/ios_util.h"
-#include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/prefs/pref_names.h"
#import "ios/chrome/browser/ui/settings/password/passwords_table_view_constants.h"
#import "ios/chrome/browser/ui/ui_feature_flags.h"
#include "ios/chrome/grit/ios_strings.h"
