Merge ash/public/cpp/ash_pref_names.* into ash/constants/

ash/{public/cpp,constants}/ash_pref_names.* serve the same purpose. The
latter is now the proper directory to add preferences to.

Bug: 1164001
Change-Id: I260bac7a7a5b8b223bc81d47f91188025fe85861
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2949053
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#900771}

diff --git a/ash/accelerators/accelerator_controller_impl.cc b/ash/accelerators/accelerator_controller_impl.cc
index 6be4ffb..2076937e 100644
--- a/ash/accelerators/accelerator_controller_impl.cc
+++ b/ash/accelerators/accelerator_controller_impl.cc

@@ -24,6 +24,7 @@
 #include "ash/clipboard/clipboard_history_controller_impl.h"
 #include "ash/components/audio/cras_audio_handler.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/constants/devicetype.h"
 #include "ash/debug.h"
@@ -37,7 +38,6 @@
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/multi_profile_uma.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/assistant/controller/assistant_ui_controller.h"
 #include "ash/public/cpp/new_window_delegate.h"
 #include "ash/public/cpp/notification_utils.h"

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 8845f63..af06c1d 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc

@@ -19,6 +19,7 @@
 #include "ash/capture_mode/capture_mode_controller.h"
 #include "ash/capture_mode/capture_mode_types.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/display/screen_orientation_controller_test_api.h"
@@ -26,7 +27,6 @@
 #include "ash/ime/mode_indicator_observer.h"
 #include "ash/ime/test_ime_controller_client.h"
 #include "ash/media/media_controller_impl.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/capture_mode_test_api.h"
 #include "ash/public/cpp/ime_info.h"
 #include "ash/public/cpp/shell_window_ids.h"

diff --git a/ash/accessibility/accessibility_controller_impl.cc b/ash/accessibility/accessibility_controller_impl.cc
index 2ef4fb5..b8a3065c6 100644
--- a/ash/accessibility/accessibility_controller_impl.cc
+++ b/ash/accessibility/accessibility_controller_impl.cc

@@ -20,6 +20,7 @@
 #include "ash/components/audio/cras_audio_handler.h"
 #include "ash/components/audio/sounds.h"
 #include "ash/constants/ash_constants.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/events/accessibility_event_rewriter.h"
 #include "ash/events/select_to_speak_event_handler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
@@ -29,7 +30,6 @@
 #include "ash/policy/policy_recommendation_restorer.h"
 #include "ash/public/cpp/accessibility_controller_client.h"
 #include "ash/public/cpp/ash_constants.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/public/cpp/session/session_observer.h"
 #include "ash/public/cpp/shell_window_ids.h"

diff --git a/ash/accessibility/accessibility_controller_unittest.cc b/ash/accessibility/accessibility_controller_unittest.cc
index e7debe9..dbe8d6d 100644
--- a/ash/accessibility/accessibility_controller_unittest.cc
+++ b/ash/accessibility/accessibility_controller_unittest.cc

@@ -12,8 +12,8 @@
 #include "ash/accessibility/sticky_keys/sticky_keys_controller.h"
 #include "ash/accessibility/test_accessibility_controller_client.h"
 #include "ash/constants/ash_constants.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/keyboard/ui/keyboard_util.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_pref_service_provider.h"
 #include "ash/shell.h"

diff --git a/ash/accessibility/magnifier/docked_magnifier_controller.cc b/ash/accessibility/magnifier/docked_magnifier_controller.cc
index 2382331..ef0e9a6f 100644
--- a/ash/accessibility/magnifier/docked_magnifier_controller.cc
+++ b/ash/accessibility/magnifier/docked_magnifier_controller.cc

@@ -9,8 +9,8 @@
 
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/accessibility/magnifier/magnifier_utils.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/host/ash_window_tree_host.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/accessibility/magnifier/docked_magnifier_controller_unittest.cc b/ash/accessibility/magnifier/docked_magnifier_controller_unittest.cc
index 32168fe..2508d98a 100644
--- a/ash/accessibility/magnifier/docked_magnifier_controller_unittest.cc
+++ b/ash/accessibility/magnifier/docked_magnifier_controller_unittest.cc

@@ -8,11 +8,11 @@
 #include <vector>
 
 #include "ash/accessibility/magnifier/magnifier_test_utils.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/display/display_util.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"

diff --git a/ash/ambient/ui/media_string_view.cc b/ash/ambient/ui/media_string_view.cc
index 0de5314..5e9429c4 100644
--- a/ash/ambient/ui/media_string_view.cc
+++ b/ash/ambient/ui/media_string_view.cc

@@ -10,7 +10,7 @@
 #include "ash/ambient/ambient_constants.h"
 #include "ash/ambient/ui/ambient_view_ids.h"
 #include "ash/ambient/util/ambient_util.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/ambient/ui/media_string_view_unittest.cc b/ash/ambient/ui/media_string_view_unittest.cc
index fb694d9..6d93df5 100644
--- a/ash/ambient/ui/media_string_view_unittest.cc
+++ b/ash/ambient/ui/media_string_view_unittest.cc

@@ -9,7 +9,7 @@
 #include "ash/ambient/ambient_constants.h"
 #include "ash/ambient/test/ambient_ash_test_base.h"
 #include "ash/ambient/ui/ambient_container_view.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/shell.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"

diff --git a/ash/app_list/app_list_controller_impl.cc b/ash/app_list/app_list_controller_impl.cc
index 4600725..754d73a 100644
--- a/ash/app_list/app_list_controller_impl.cc
+++ b/ash/app_list/app_list_controller_impl.cc

@@ -34,7 +34,6 @@
 #include "ash/public/cpp/app_list/app_list_metrics.h"
 #include "ash/public/cpp/app_list/app_list_notifier.h"
 #include "ash/public/cpp/app_list/app_list_types.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/assistant/controller/assistant_controller.h"
 #include "ash/public/cpp/assistant/controller/assistant_ui_controller.h"
 #include "ash/public/cpp/shelf_config.h"

diff --git a/ash/app_list/views/assistant/assistant_test_api_impl.cc b/ash/app_list/views/assistant/assistant_test_api_impl.cc
index d399398b..3617958 100644
--- a/ash/app_list/views/assistant/assistant_test_api_impl.cc
+++ b/ash/app_list/views/assistant/assistant_test_api_impl.cc

@@ -11,7 +11,7 @@
 #include "ash/app_list/views/app_list_view.h"
 #include "ash/app_list/views/contents_view.h"
 #include "ash/assistant/ui/assistant_view_ids.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/assistant/assistant_state.h"
 #include "ash/public/cpp/tablet_mode.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/ash_prefs.cc b/ash/ash_prefs.cc
index b8a4436..b823c651 100644
--- a/ash/ash_prefs.cc
+++ b/ash/ash_prefs.cc

@@ -19,7 +19,6 @@
 #include "ash/login/login_screen_controller.h"
 #include "ash/login/ui/login_expanded_public_account_view.h"
 #include "ash/media/media_controller_impl.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/holding_space/holding_space_prefs.h"
 #include "ash/session/fullscreen_controller.h"
 #include "ash/shelf/contextual_tooltip.h"

diff --git a/ash/assistant/assistant_controller_impl.cc b/ash/assistant/assistant_controller_impl.cc
index e296e91..ba6b717 100644
--- a/ash/assistant/assistant_controller_impl.cc
+++ b/ash/assistant/assistant_controller_impl.cc

@@ -10,7 +10,6 @@
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/assistant/util/deep_link_util.h"
 #include "ash/public/cpp/android_intent_helper.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/new_window_delegate.h"
 #include "ash/public/mojom/assistant_volume_control.mojom.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/assistant/assistant_interaction_controller_impl.cc b/ash/assistant/assistant_interaction_controller_impl.cc
index 3256d55..9b488b61 100644
--- a/ash/assistant/assistant_interaction_controller_impl.cc
+++ b/ash/assistant/assistant_interaction_controller_impl.cc

@@ -20,8 +20,8 @@
 #include "ash/assistant/util/assistant_util.h"
 #include "ash/assistant/util/deep_link_util.h"
 #include "ash/assistant/util/histogram_util.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/android_intent_helper.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/assistant/assistant_setup.h"
 #include "ash/public/cpp/assistant/assistant_state.h"
 #include "ash/public/cpp/assistant/controller/assistant_suggestions_controller.h"

diff --git a/ash/assistant/assistant_ui_controller_impl.cc b/ash/assistant/assistant_ui_controller_impl.cc
index 74d15e6..74cb4ca 100644
--- a/ash/assistant/assistant_ui_controller_impl.cc
+++ b/ash/assistant/assistant_ui_controller_impl.cc

@@ -10,7 +10,7 @@
 #include "ash/assistant/util/assistant_util.h"
 #include "ash/assistant/util/deep_link_util.h"
 #include "ash/assistant/util/histogram_util.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/assistant/assistant_setup.h"
 #include "ash/public/cpp/assistant/assistant_state.h"
 #include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h"

diff --git a/ash/clipboard/clipboard_nudge_controller.cc b/ash/clipboard/clipboard_nudge_controller.cc
index b19fa21..1363c84 100644
--- a/ash/clipboard/clipboard_nudge_controller.cc
+++ b/ash/clipboard/clipboard_nudge_controller.cc

@@ -8,7 +8,7 @@
 #include "ash/clipboard/clipboard_history_util.h"
 #include "ash/clipboard/clipboard_nudge.h"
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "base/bind.h"

diff --git a/ash/constants/ash_pref_names.cc b/ash/constants/ash_pref_names.cc
index bb0566e8..440d394 100644
--- a/ash/constants/ash_pref_names.cc
+++ b/ash/constants/ash_pref_names.cc

@@ -154,5 +154,652 @@
 const char kDeviceSystemWideTracingEnabled[] =
     "device_system_wide_tracing_enabled";
 
+// A boolean pref which determines whether the large cursor feature is enabled.
+const char kAccessibilityLargeCursorEnabled[] =
+    "settings.a11y.large_cursor_enabled";
+// An integer pref that specifies the size of large cursor for accessibility.
+const char kAccessibilityLargeCursorDipSize[] =
+    "settings.a11y.large_cursor_dip_size";
+// A boolean pref which determines whether the sticky keys feature is enabled.
+const char kAccessibilityStickyKeysEnabled[] =
+    "settings.a11y.sticky_keys_enabled";
+// A boolean pref which determines whether spoken feedback is enabled.
+const char kAccessibilitySpokenFeedbackEnabled[] = "settings.accessibility";
+// A boolean pref which determines whether high contrast is enabled.
+const char kAccessibilityHighContrastEnabled[] =
+    "settings.a11y.high_contrast_enabled";
+// A boolean pref which determines whether screen magnifier is enabled.
+// NOTE: We previously had prefs named settings.a11y.screen_magnifier_type and
+// settings.a11y.screen_magnifier_type2, but we only shipped one type (full).
+// See http://crbug.com/170850 for history.
+const char kAccessibilityScreenMagnifierEnabled[] =
+    "settings.a11y.screen_magnifier";
+// A boolean pref which determines whether focus following for screen magnifier
+// is enabled.
+const char kAccessibilityScreenMagnifierFocusFollowingEnabled[] =
+    "settings.a11y.screen_magnifier_focus_following";
+// An integer pref which indicates the mouse following mode for screen
+// magnifier. This maps to AccessibilityController::MagnifierMouseFollowingMode.
+const char kAccessibilityScreenMagnifierMouseFollowingMode[] =
+    "settings.a11y.screen_magnifier_mouse_following_mode";
+// A boolean pref which determines whether screen magnifier should center
+// the text input focus.
+const char kAccessibilityScreenMagnifierCenterFocus[] =
+    "settings.a11y.screen_magnifier_center_focus";
+// A double pref which determines a zooming scale of the screen magnifier.
+const char kAccessibilityScreenMagnifierScale[] =
+    "settings.a11y.screen_magnifier_scale";
+// A boolean pref which determines whether the virtual keyboard is enabled for
+// accessibility.  This feature is separate from displaying an onscreen keyboard
+// due to lack of a physical keyboard.
+const char kAccessibilityVirtualKeyboardEnabled[] =
+    "settings.a11y.virtual_keyboard";
+// A pref that identifies which kind of features are enabled for the Web Kiosk
+// session.
+const char kAccessibilityVirtualKeyboardFeatures[] =
+    "settings.a11y.virtual_keyboard_features";
+// A boolean pref which determines whether the mono audio output is enabled for
+// accessibility.
+const char kAccessibilityMonoAudioEnabled[] = "settings.a11y.mono_audio";
+// A boolean pref which determines whether autoclick is enabled.
+const char kAccessibilityAutoclickEnabled[] = "settings.a11y.autoclick";
+// A boolean pref which determines whether the accessibility shortcuts are
+// enabled or not.
+const char kAccessibilityShortcutsEnabled[] = "settings.a11y.shortcuts_enabled";
+// An integer pref which determines time in ms between when the mouse cursor
+// stops and when an autoclick event is triggered.
+const char kAccessibilityAutoclickDelayMs[] =
+    "settings.a11y.autoclick_delay_ms";
+// An integer pref which determines the event type for an autoclick event. This
+// maps to AccessibilityController::AutoclickEventType.
+const char kAccessibilityAutoclickEventType[] =
+    "settings.a11y.autoclick_event_type";
+// Whether Autoclick should immediately return to left click after performing
+// another event type action, or whether it should stay as the other event type.
+const char kAccessibilityAutoclickRevertToLeftClick[] =
+    "settings.a11y.autoclick_revert_to_left_click";
+// Whether Autoclick should stabilize the cursor movement before a click occurs
+// or not.
+const char kAccessibilityAutoclickStabilizePosition[] =
+    "settings.a11y.autoclick_stabilize_position";
+// The default threshold of mouse movement, measured in DIP, that will initiate
+// a new autoclick.
+const char kAccessibilityAutoclickMovementThreshold[] =
+    "settings.a11y.autoclick_movement_threshold";
+// The Autoclick menu position on the screen, an AutoclickMenuPosition.
+const char kAccessibilityAutoclickMenuPosition[] =
+    "settings.a11y.autoclick_menu_position";
+// A boolean pref which determines whether caret highlighting is enabled.
+const char kAccessibilityCaretHighlightEnabled[] =
+    "settings.a11y.caret_highlight";
+// A boolean pref which determines whether cursor highlighting is enabled.
+const char kAccessibilityCursorHighlightEnabled[] =
+    "settings.a11y.cursor_highlight";
+// A boolean pref which determines whether custom cursor color is enabled.
+const char kAccessibilityCursorColorEnabled[] =
+    "settings.a11y.cursor_color_enabled";
+// An integer pref which determines the custom cursor color.
+const char kAccessibilityCursorColor[] = "settings.a11y.cursor_color";
+// A boolean pref which determines whether floating accessibility menu is
+// enabled.
+const char kAccessibilityFloatingMenuEnabled[] = "settings.a11y.floating_menu";
+// Floating a11y menu position, a FloatingMenuPosition;
+const char kAccessibilityFloatingMenuPosition[] =
+    "settings.a11y.floating_menu_position";
+// A boolean pref which determines whether focus highlighting is enabled.
+const char kAccessibilityFocusHighlightEnabled[] =
+    "settings.a11y.focus_highlight";
+// A boolean pref which determines whether select-to-speak is enabled.
+const char kAccessibilitySelectToSpeakEnabled[] =
+    "settings.a11y.select_to_speak";
+// A boolean pref which determines whether Switch Access is enabled.
+const char kAccessibilitySwitchAccessEnabled[] =
+    "settings.a11y.switch_access.enabled";
+// A dictionary pref keyed on a key code mapped to a list value of device types
+// for the "select" action.
+const char kAccessibilitySwitchAccessSelectDeviceKeyCodes[] =
+    "settings.a11y.switch_access.select.device_key_codes";
+// A dictionary pref keyed on a key code mapped to a list value of device types
+// for the "next" action.
+const char kAccessibilitySwitchAccessNextDeviceKeyCodes[] =
+    "settings.a11y.switch_access.next.device_key_codes";
+// A dictionary pref keyed on a key code mapped to a list value of device types
+// for the "previous" action.
+const char kAccessibilitySwitchAccessPreviousDeviceKeyCodes[] =
+    "settings.a11y.switch_access.previous.device_key_codes";
+// A boolean pref which determines whether auto-scanning is enabled within
+// Switch Access.
+const char kAccessibilitySwitchAccessAutoScanEnabled[] =
+    "settings.a11y.switch_access.auto_scan.enabled";
+// An integer pref which determines time delay in ms before automatically
+// scanning forward (when auto-scan is enabled).
+const char kAccessibilitySwitchAccessAutoScanSpeedMs[] =
+    "settings.a11y.switch_access.auto_scan.speed_ms";
+// An integer pref which determines time delay in ms before automatically
+// scanning forward while navigating the keyboard (when auto-scan is
+// enabled).
+const char kAccessibilitySwitchAccessAutoScanKeyboardSpeedMs[] =
+    "settings.a11y.switch_access.auto_scan.keyboard.speed_ms";
+// An integer pref which determines speed in dips per second that the gliding
+// point scan cursor in switch access moves across the screen.
+const char kAccessibilitySwitchAccessPointScanSpeedDipsPerSecond[] =
+    "settings.a11y.switch_access.point_scan.speed_dips_per_second";
+// A boolean pref which, if set, indicates that shelf navigation buttons (home,
+// back and overview button) should be shown in tablet mode. Note that shelf
+// buttons might be shown even if the pref value is false - for example, if
+// spoken feedback, autoclick or switch access are enabled.
+const char kAccessibilityTabletModeShelfNavigationButtonsEnabled[] =
+    "settings.a11y.tablet_mode_shelf_nav_buttons_enabled";
+// A boolean pref which determines whether dictation is enabled.
+const char kAccessibilityDictationEnabled[] = "settings.a11y.dictation";
+// A string pref which determines the locale used for dictation speech
+// recognition. Should be BCP-47 format, e.g. "en-US" or "es-ES".
+const char kAccessibilityDictationLocale[] = "settings.a11y.dictation_locale";
+// A boolean pref which determines whether the accessibility menu shows
+// regardless of the state of a11y features.
+const char kShouldAlwaysShowAccessibilityMenu[] = "settings.a11y.enable_menu";
+
+// A boolean pref which determines whether alt-tab should show only windows in
+// the current desk or all windows.
+const char kAltTabPerDesk[] = "ash.alttab.per_desk";
+
+// A dictionary storing the number of times and most recent time all contextual
+// tooltips have been shown.
+const char kContextualTooltips[] = "settings.contextual_tooltip.shown_info";
+
+// A list containing the stored virtual desks names in the same order of the
+// desks in the overview desks bar. This list will be used to restore the desks,
+// their order, and their names for the primary user on first signin. If a desk
+// hasn't been renamed by the user (i.e. it uses one of the default
+// automatically-assigned desk names such as "Desk 1", "Desk 2", ... etc.), its
+// name will appear in this list as an empty string. The desk names are stored
+// as UTF8 strings.
+const char kDesksNamesList[] = "ash.desks.desks_names_list";
+// This list stores the metrics of virtual desks. Like |kDesksNamesList|, this
+// list stores entries in the same order of the desks in the overview desks bar.
+// Values are stored as dictionaries.
+const char kDesksMetricsList[] = "ash.desks.desks_metrics_list";
+// A dict pref storing the metrics related to the weekly active desks of a user.
+const char kDesksWeeklyActiveDesksMetrics[] = "ash.desks.weekly_active_desks";
+// An integer index of a user's active desk.
+const char kDesksActiveDesk[] = "ash.desks.active_desk";
+
+// A boolean pref storing the enabled status of the Docked Magnifier feature.
+const char kDockedMagnifierEnabled[] = "ash.docked_magnifier.enabled";
+// A double pref storing the scale value of the Docked Magnifier feature by
+// which the screen is magnified.
+const char kDockedMagnifierScale[] = "ash.docked_magnifier.scale";
+
+// A boolean pref which indicates whether the docked magnifier confirmation
+// dialog has ever been shown.
+const char kDockedMagnifierAcceleratorDialogHasBeenAccepted[] =
+    "settings.a11y.docked_magnifier_accelerator_dialog_has_been_accepted";
+// A boolean pref which indicates whether the high contrast magnifier
+// confirmation dialog has ever been shown.
+const char kHighContrastAcceleratorDialogHasBeenAccepted[] =
+    "settings.a11y.high_contrast_accelerator_dialog_has_been_accepted";
+// A boolean pref which indicates whether the screen magnifier confirmation
+// dialog has ever been shown.
+const char kScreenMagnifierAcceleratorDialogHasBeenAccepted[] =
+    "settings.a11y.screen_magnifier_accelerator_dialog_has_been_accepted";
+// A boolean pref which indicates whether the dictation confirmation dialog has
+// ever been shown.
+const char kDictationAcceleratorDialogHasBeenAccepted[] =
+    "settings.a11y.dictation_accelerator_dialog_has_been_accepted";
+// A boolean pref which indicates whether the display rotation confirmation
+// dialog has ever been shown.
+// Renamed 10/2019 to force reset the pref to false.
+const char kDisplayRotationAcceleratorDialogHasBeenAccepted2[] =
+    "settings.a11y.display_rotation_accelerator_dialog_has_been_accepted2";
+
+// A dictionary pref that stores the mixed mirror mode parameters.
+const char kDisplayMixedMirrorModeParams[] =
+    "settings.display.mixed_mirror_mode_param";
+// Power state of the current displays from the last run.
+const char kDisplayPowerState[] = "settings.display.power_state";
+// A dictionary pref that stores per display preferences.
+const char kDisplayProperties[] = "settings.display.properties";
+// Boolean controlling whether privacy screen is enabled.
+const char kDisplayPrivacyScreenEnabled[] =
+    "settings.display.privacy_screen_enabled";
+// A dictionary pref that specifies the state of the rotation lock, and the
+// display orientation, for the internal display.
+const char kDisplayRotationLock[] = "settings.display.rotation_lock";
+// A dictionary pref that stores the touch associations for the device.
+const char kDisplayTouchAssociations[] = "settings.display.touch_associations";
+// A dictionary pref that stores the port mapping for touch devices.
+const char kDisplayTouchPortAssociations[] =
+    "settings.display.port_associations";
+// A list pref that stores the mirror info for each external display.
+const char kExternalDisplayMirrorInfo[] =
+    "settings.display.external_display_mirror_info";
+// A dictionary pref that specifies per-display layout/offset information.
+// Its key is the ID of the display and its value is a dictionary for the
+// layout/offset information.
+const char kSecondaryDisplays[] = "settings.display.secondary_displays";
+// A boolean pref which determines whether the display configuration set by
+// managed guest session should be stored in local state.
+const char kAllowMGSToStoreDisplayProperties[] =
+    "settings.display.allow_mgs_to_store";
+
+// A boolean pref that enable fullscreen alert bubble.
+// TODO(zxdan): Change to an allowlist in M89.
+const char kFullscreenAlertEnabled[] = "ash.fullscreen_alert_enabled";
+
+// A boolean pref storing whether the gesture education notification has ever
+// been shown to the user, which we use to stop showing it again.
+const char kGestureEducationNotificationShown[] =
+    "ash.gesture_education.notification_shown";
+
+// A boolean pref which stores whether a stylus has been seen before.
+const char kHasSeenStylus[] = "ash.has_seen_stylus";
+// A boolean pref which stores whether a the palette warm welcome bubble
+// (displayed when a user first uses a stylus) has been shown before.
+const char kShownPaletteWelcomeBubble[] = "ash.shown_palette_welcome_bubble";
+// A boolean pref that specifies if the stylus tools should be enabled/disabled.
+const char kEnableStylusTools[] = "settings.enable_stylus_tools";
+// A boolean pref that specifies if the ash palette should be launched after an
+// eject input event has been received.
+const char kLaunchPaletteOnEjectEvent[] =
+    "settings.launch_palette_on_eject_event";
+
+// Boolean pref indicating whether the PCI tunneling is allowed for external
+// Thunderbolt/USB4 peripherals. This pref is only used if the policy
+// "DevicePciPeripheralDataAccessEnabled" is set to "unset".
+const char kLocalStateDevicePeripheralDataAccessEnabled[] =
+    "settings.local_state_device_pci_data_access_enabled";
+
+// A boolean pref that specifies if the cellular setup notification can be
+// shown or not. This notification should be shown post-OOBE if the user has a
+// cellular-capable device but no available cellular networks. It should only be
+// shown at most once per user.
+const char kCanCellularSetupNotificationBeShown[] =
+    "ash.cellular_setup.can_setup_notification_be_shown";
+
+// Boolean pref indicating whether the privacy warning of the managed-guest
+// session on both; the login screen and inside the auto-launched session,
+// should be displayed or not.
+const char kManagedGuestSessionPrivacyWarningsEnabled[] =
+    "managed_session.privacy_warning_enabled";
+
+// A string pref storing the type of lock screen notification mode.
+// "show" -> show notifications on the lock screen
+// "hide" -> hide notifications at all on the lock screen (default)
+// "hideSensitive" -> hide sensitive content on the lock screen
+// (other values are treated as "hide")
+const char kMessageCenterLockScreenMode[] =
+    "ash.message_center.lock_screen_mode";
+
+// Value of each options of the lock screen notification settings. They are
+// used the pref of ash::prefs::kMessageCenterLockScreenMode.
+const char kMessageCenterLockScreenModeShow[] = "show";
+const char kMessageCenterLockScreenModeHide[] = "hide";
+const char kMessageCenterLockScreenModeHideSensitive[] = "hideSensitive";
+
+// A boolean pref storing the enabled status of the ambient color feature.
+const char kAmbientColorEnabled[] = "ash.ambient_color.enabled";
+
+// A boolean pref used when dark light mode feature is enabled to indicate
+// whether the color mode is themed. If true, the background color will be
+// calculated based on extracted wallpaper color.
+const char kColorModeThemed[] = "ash.dark_mode.color_mode_themed";
+
+// A boolean pref that indicates whether dark mode is enabled.
+const char kDarkModeEnabled[] = "ash.dark_mode_enabled";
+
+// A boolean pref storing the enabled status of the NightLight feature.
+const char kNightLightEnabled[] = "ash.night_light.enabled";
+
+// A double pref storing the screen color temperature set by the NightLight
+// feature. The expected values are in the range of 0.0 (least warm) and 1.0
+// (most warm).
+const char kNightLightTemperature[] = "ash.night_light.color_temperature";
+
+// An integer pref storing the type of automatic scheduling of turning on and
+// off the NightLight feature. Valid values are:
+// 0 -> NightLight is never turned on or off automatically.
+// 1 -> NightLight is turned on and off at the sunset and sunrise times
+// respectively.
+// 2 -> NightLight schedule times are explicitly set by the user.
+//
+// See ash::NightLightController::ScheduleType.
+const char kNightLightScheduleType[] = "ash.night_light.schedule_type";
+
+// Integer prefs storing the start and end times of the automatic schedule at
+// which NightLight turns on and off respectively when the schedule type is set
+// to a custom schedule. The times are represented as the number of minutes from
+// 00:00 (12:00 AM) regardless of the date or the timezone.
+// See ash::TimeOfDayTime.
+const char kNightLightCustomStartTime[] = "ash.night_light.custom_start_time";
+const char kNightLightCustomEndTime[] = "ash.night_light.custom_end_time";
+
+// Double prefs storing the most recent valid geoposition, which is only used
+// when the device lacks connectivity and we're unable to retrieve a valid
+// geoposition to calculate the sunset / sunrise times.
+const char kNightLightCachedLatitude[] = "ash.night_light.cached_latitude";
+const char kNightLightCachedLongitude[] = "ash.night_light.cached_longitude";
+
+// A boolean pref storing whether the AutoNightLight notification has ever been
+// dismissed by the user, which we use to stop showing it again.
+const char kAutoNightLightNotificationDismissed[] =
+    "ash.auto_night_light.notification_dismissed";
+
+// Whether the Chrome OS lock screen is allowed.
+const char kAllowScreenLock[] = "allow_screen_lock";
+
+// A boolean pref that turns on automatic screen locking.
+const char kEnableAutoScreenLock[] = "settings.enable_screen_lock";
+
+// Screen brightness percent values to be used when running on AC power.
+// Specified by the policy.
+const char kPowerAcScreenBrightnessPercent[] =
+    "power.ac_screen_brightness_percent";
+
+// Inactivity time in milliseconds while the system is on AC power before
+// the screen should be dimmed, turned off, or locked, before an
+// IdleActionImminent D-Bus signal should be sent, or before
+// kPowerAcIdleAction should be performed.  0 disables the delay (N/A for
+// kPowerAcIdleDelayMs).
+const char kPowerAcScreenDimDelayMs[] = "power.ac_screen_dim_delay_ms";
+const char kPowerAcScreenOffDelayMs[] = "power.ac_screen_off_delay_ms";
+const char kPowerAcScreenLockDelayMs[] = "power.ac_screen_lock_delay_ms";
+const char kPowerAcIdleWarningDelayMs[] = "power.ac_idle_warning_delay_ms";
+
+// Screen brightness percent values to be used when running on battery power.
+// Specified by the policy.
+const char kPowerBatteryScreenBrightnessPercent[] =
+    "power.battery_screen_brightness_percent";
+
+// Similar delays while the system is on battery power.
+const char kPowerBatteryScreenDimDelayMs[] =
+    "power.battery_screen_dim_delay_ms";
+const char kPowerBatteryScreenOffDelayMs[] =
+    "power.battery_screen_off_delay_ms";
+const char kPowerBatteryScreenLockDelayMs[] =
+    "power.battery_screen_lock_delay_ms";
+const char kPowerBatteryIdleWarningDelayMs[] =
+    "power.battery_idle_warning_delay_ms";
+const char kPowerBatteryIdleDelayMs[] = "power.battery_idle_delay_ms";
+const char kPowerAcIdleDelayMs[] = "power.ac_idle_delay_ms";
+
+// Inactivity delays used to dim the screen or turn it off while the screen is
+// locked.
+const char kPowerLockScreenDimDelayMs[] = "power.lock_screen_dim_delay_ms";
+const char kPowerLockScreenOffDelayMs[] = "power.lock_screen_off_delay_ms";
+
+// Action that should be performed when the idle delay is reached while the
+// system is on AC power or battery power.
+// Values are from the chromeos::PowerPolicyController::Action enum.
+const char kPowerAcIdleAction[] = "power.ac_idle_action";
+const char kPowerBatteryIdleAction[] = "power.battery_idle_action";
+
+// Action that should be performed when the lid is closed.
+// Values are from the chromeos::PowerPolicyController::Action enum.
+const char kPowerLidClosedAction[] = "power.lid_closed_action";
+
+// Should audio and video activity be used to disable the above delays?
+const char kPowerUseAudioActivity[] = "power.use_audio_activity";
+const char kPowerUseVideoActivity[] = "power.use_video_activity";
+
+// Should extensions, ARC apps, and other code within Chrome be able to override
+// system power management (preventing automatic actions like sleeping, locking,
+// or screen dimming)?
+const char kPowerAllowWakeLocks[] = "power.allow_wake_locks";
+
+// Should extensions, ARC apps, and other code within Chrome be able to override
+// display-related power management? (Disallowing wake locks in general takes
+// precedence over this.)
+const char kPowerAllowScreenWakeLocks[] = "power.allow_screen_wake_locks";
+
+// Amount by which the screen-dim delay should be scaled while the system
+// is in presentation mode. Values are limited to a minimum of 1.0.
+const char kPowerPresentationScreenDimDelayFactor[] =
+    "power.presentation_screen_dim_delay_factor";
+
+// Amount by which the screen-dim delay should be scaled when user activity is
+// observed while the screen is dimmed or soon after the screen has been turned
+// off.  Values are limited to a minimum of 1.0.
+const char kPowerUserActivityScreenDimDelayFactor[] =
+    "power.user_activity_screen_dim_delay_factor";
+
+// Whether the power management delays should start running only after the first
+// user activity has been observed in a session.
+const char kPowerWaitForInitialUserActivity[] =
+    "power.wait_for_initial_user_activity";
+
+// Boolean controlling whether the panel backlight should be forced to a
+// nonzero level when user activity is observed.
+const char kPowerForceNonzeroBrightnessForUserActivity[] =
+    "power.force_nonzero_brightness_for_user_activity";
+
+// Boolean controlling whether a shorter suspend delay should be used after the
+// user forces the display off by pressing the power button. Provided to allow
+// policy to control this behavior.
+const char kPowerFastSuspendWhenBacklightsForcedOff[] =
+    "power.fast_suspend_when_backlights_forced_off";
+
+// Boolean controlling whether smart dim model is enabled.
+const char kPowerSmartDimEnabled[] = "power.smart_dim_enabled";
+
+// Boolean controlling whether ALS logging is enabled.
+const char kPowerAlsLoggingEnabled[] = "power.als_logging_enabled";
+
+// Boolean controlling whether the settings is enabled. This pref is intended to
+// be set only by policy not by user.
+const char kOsSettingsEnabled[] = "os_settings_enabled";
+
+// |kShelfAlignment| and |kShelfAutoHideBehavior| have a local variant. The
+// local variant is not synced and is used if set. If the local variant is not
+// set its value is set from the synced value (once prefs have been
+// synced). This gives a per-machine setting that is initialized from the last
+// set value.
+// These values are default on the machine but can be overridden by per-display
+// values in kShelfPreferences (unless overridden by managed policy).
+// String value corresponding to ash::ShelfAlignment (e.g. "Bottom").
+const char kShelfAlignment[] = "shelf_alignment";
+const char kShelfAlignmentLocal[] = "shelf_alignment_local";
+// String value corresponding to ash::ShelfAutoHideBehavior (e.g. "Never").
+const char kShelfAutoHideBehavior[] = "auto_hide_behavior";
+const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local";
+// Dictionary value that holds per-display preference of shelf alignment and
+// auto-hide behavior. Key of the dictionary is the id of the display, and
+// its value is a dictionary whose keys are kShelfAlignment and
+// kShelfAutoHideBehavior.
+const char kShelfPreferences[] = "shelf_preferences";
+
+// Boolean pref indicating whether to show a logout button in the system tray.
+const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray";
+
+// Integer pref indicating the length of time in milliseconds for which a
+// confirmation dialog should be shown when the user presses the logout button.
+// A value of 0 indicates that logout should happen immediately, without showing
+// a confirmation dialog.
+const char kLogoutDialogDurationMs[] = "logout_dialog_duration_ms";
+
+// A boolean pref that when set to true, displays the logout confirmation
+// dialog. If set to false, it prevents showing the dialog and the subsequent
+// logout after closing the last window.
+const char kSuggestLogoutAfterClosingLastWindow[] =
+    "suggest_logout_after_closing_last_window";
+
+// A dictionary pref that maps usernames to wallpaper info.
+const char kUserWallpaperInfo[] = "user_wallpaper_info";
+
+// A dictionary pref that maps usernames to wallpaper info.
+// This is for wallpapers that are syncable across devices.
+const char kSyncableWallpaperInfo[] = "syncable_wallpaper_info";
+
+// A dictionary pref that maps wallpaper file paths to their prominent colors.
+const char kWallpaperColors[] = "ash.wallpaper.prominent_colors";
+
+// String pref storing the collection_id used to query for new wallpapers when
+// daily refresh is enabled.
+const char kWallpaperCollectionId[] = "ash.wallpaper.collection_id";
+
+// Boolean pref indicating whether a user has enabled the bluetooth adapter.
+const char kUserBluetoothAdapterEnabled[] =
+    "ash.user.bluetooth.adapter_enabled";
+
+// Boolean pref indicating system-wide setting for bluetooth adapter power.
+const char kSystemBluetoothAdapterEnabled[] =
+    "ash.system.bluetooth.adapter_enabled";
+
+// A boolean pref which determines whether tap-dragging is enabled.
+const char kTapDraggingEnabled[] = "settings.touchpad.enable_tap_dragging";
+
+// Boolean prefs for the status of the touchscreen and the touchpad.
+const char kTouchpadEnabled[] = "events.touch_pad.enabled";
+const char kTouchscreenEnabled[] = "events.touch_screen.enabled";
+
+// String pref storing the salt for the pin quick unlock mechanism.
+const char kQuickUnlockPinSalt[] = "quick_unlock.pin.salt";
+
+// Dictionary prefs in local state that keeps information about detachable
+// bases - for exmaple the last used base per user.
+const char kDetachableBaseDevices[] = "ash.detachable_base.devices";
+
+// Pref storing the number of sessions in which Assistant onboarding was shown.
+const char kAssistantNumSessionsWhereOnboardingShown[] =
+    "ash.assistant.num_sessions_where_onboarding_shown";
+
+// Pref storing the time of the last Assistant interaction.
+const char kAssistantTimeOfLastInteraction[] =
+    "ash.assistant.time_of_last_interaction";
+
+// Whether the user is allowed to disconnect and configure VPN connections.
+const char kVpnConfigAllowed[] = "vpn_config_allowed";
+
+// A boolean pref that indicates whether power peak shift is enabled.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kPowerPeakShiftEnabled[] = "ash.power.peak_shift_enabled";
+
+// An integer pref that specifies the power peak shift battery threshold in
+// percent.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kPowerPeakShiftBatteryThreshold[] =
+    "ash.power.peak_shift_battery_threshold";
+
+// A dictionary pref that specifies the power peak shift day configs.
+// For details see "DevicePowerPeakShiftDayConfig" in policy_templates.json.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kPowerPeakShiftDayConfig[] = "ash.power.peak_shift_day_config";
+
+// A boolean pref that indicates whether boot on AC is enabled.
+const char kBootOnAcEnabled[] = "ash.power.boot_on_ac_enabled";
+
+// A boolean pref that indicates whether advanced battery charge mode is
+// enabled.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kAdvancedBatteryChargeModeEnabled[] =
+    "ash.power.advanced_battery_charge_mode_enabled";
+
+// A dictionary pref that specifies the advanced battery charge mode day config.
+// For details see "DeviceAdvancedBatteryChargeModeDayConfig" in
+// policy_templates.json.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kAdvancedBatteryChargeModeDayConfig[] =
+    "ash.power.advanced_battery_charge_mode_day_config";
+
+// An integer pref that specifies the battery charge mode.
+// For details see "DeviceBatteryChargeMode" in policy_templates.json.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kBatteryChargeMode[] = "ash.power.battery_charge_mode";
+
+// An integer pref that specifies the battery charge custom start charging in
+// percent.
+// For details see "DeviceBatteryChargeCustomStartCharging" in
+// policy_templates.json.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kBatteryChargeCustomStartCharging[] =
+    "ash.power.battery_charge_custom_start_charging";
+
+// An integer pref that specifies the battery charge custom stop charging in
+// percent.
+// For details see "DeviceBatteryChargeCustomStopCharging" in
+// policy_templates.json.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kBatteryChargeCustomStopCharging[] =
+    "ash.power.battery_charge_custom_stop_charging";
+
+// A boolean pref that indicates whether USB power share is enabled.
+// For details see "DeviceUsbPowerShareEnabled" in policy_templates.json.
+// Ignored unless powerd is configured to honor charging-related prefs.
+const char kUsbPowerShareEnabled[] = "ash.power.usb_power_share_enabled";
+
+// An integer pref that specifies how many times the Suggested Content privacy
+// info has been shown in Launcher. This value will increment by one every time
+// when Launcher changes state from Peeking to Half or FullscreenSearch up to a
+// predefined threshold, e.g. six times. If the info has been shown for more
+// than the threshold, do not show the privacy info any more.
+const char kSuggestedContentInfoShownInLauncher[] =
+    "ash.launcher.suggested_content_info_shown";
+
+// A boolean pref that indicates whether the Suggested Content privacy info may
+// be displayed to user. A false value indicates that the info can be displayed
+// if the value of |kSuggestedContentInfoShownInLauncher| is smaller than the
+// predefined threshold. A true value implies that the user has dismissed the
+// info view, and do not show the privacy info any more.
+const char kSuggestedContentInfoDismissedInLauncher[] =
+    "ash.launcher.suggested_content_info_dismissed";
+
+// A boolean pref that indicates whether lock screen media controls are enabled.
+// Controlled by user policy.
+const char kLockScreenMediaControlsEnabled[] =
+    "ash.lock_screen_media_controls_enabled";
+
+// Boolean pref which determines whether key repeat is enabled.
+const char kXkbAutoRepeatEnabled[] =
+    "settings.language.xkb_auto_repeat_enabled_r2";
+
+// Integer pref which determines key repeat delay (in ms).
+const char kXkbAutoRepeatDelay[] = "settings.language.xkb_auto_repeat_delay_r2";
+
+// Integer pref which determines key repeat interval (in ms).
+const char kXkbAutoRepeatInterval[] =
+    "settings.language.xkb_auto_repeat_interval_r2";
+// "_r2" suffixes were added to the three prefs above when we changed the
+// preferences to not be user-configurable or sync with the cloud. The prefs are
+// now user-configurable and syncable again, but we don't want to overwrite the
+// current values with the old synced values, so we continue to use this suffix.
+
+// A boolean pref which is true if touchpad reverse scroll is enabled.
+const char kNaturalScroll[] = "settings.touchpad.natural_scroll";
+// A boolean pref which is true if mouse reverse scroll is enabled.
+const char kMouseReverseScroll[] = "settings.mouse.reverse_scroll";
+
+// A dictionary storing the number of times and most recent time the multipaste
+// contextual nudge was shown.
+const char kMultipasteNudges[] = "ash.clipboard.multipaste_nudges";
+
+// A boolean pref that indicates whether app badging is shown in launcher and
+// shelf.
+const char kAppNotificationBadgingEnabled[] =
+    "ash.app_notification_badging_enabled";
+
+// An integer pref that indicates whether global media controls is pinned to
+// shelf or it's unset and need to be determined by screen size during runtime.
+const char kGlobalMediaControlsPinned[] =
+    "ash.system.global_media_controls_pinned";
+
+// An integer pref that tracks how many times the user is able to click on
+// PciePeripheral-related notifications before hiding new notifications.
+const char kPciePeripheralDisplayNotificationRemaining[] =
+    "ash.pcie_peripheral_display_notification_remaining";
+
+// Boolean prefs storing whether various IME-related keyboard shortcut reminders
+// have previously been dismissed or not.
+const char kLastUsedImeShortcutReminderDismissed[] =
+    "ash.shortcut_reminders.last_used_ime_dismissed";
+const char kNextImeShortcutReminderDismissed[] =
+    "ash.shortcut_reminders.next_ime_dismissed";
+
+// An integet pref that tracks how many times the user has been shown the
+// notification about shortcuts changing.
+const char kImprovedShortcutsNotificationShownCount[] =
+    "ash.improved_shortcuts_notification_shown_count";
+
+// NOTE: New prefs should start with the "ash." prefix. Existing prefs moved
+// into this file should not be renamed, since they may be synced.
+
 }  // namespace prefs
 }  // namespace ash

diff --git a/ash/constants/ash_pref_names.h b/ash/constants/ash_pref_names.h
index 528f60a..570f11a 100644
--- a/ash/constants/ash_pref_names.h
+++ b/ash/constants/ash_pref_names.h

@@ -69,6 +69,305 @@
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const char kDeviceSystemWideTracingEnabled[];
 
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityLargeCursorEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityLargeCursorDipSize[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityStickyKeysEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySpokenFeedbackEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityHighContrastEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityScreenMagnifierCenterFocus[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityScreenMagnifierEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityScreenMagnifierFocusFollowingEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityScreenMagnifierMouseFollowingMode[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityScreenMagnifierScale[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityVirtualKeyboardEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityVirtualKeyboardFeatures[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityMonoAudioEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityAutoclickEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityShortcutsEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityAutoclickDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityAutoclickEventType[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityAutoclickRevertToLeftClick[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityAutoclickStabilizePosition[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityAutoclickMovementThreshold[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityAutoclickMenuPosition[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityCaretHighlightEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityCursorHighlightEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityCursorColorEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kAccessibilityCursorColor[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityFloatingMenuEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityFloatingMenuPosition[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityFocusHighlightEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySelectToSpeakEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessSelectDeviceKeyCodes[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessNextDeviceKeyCodes[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessPreviousDeviceKeyCodes[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessAutoScanEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessAutoScanSpeedMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessAutoScanKeyboardSpeedMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilitySwitchAccessPointScanSpeedDipsPerSecond[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityTabletModeShelfNavigationButtonsEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityDictationEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAccessibilityDictationLocale[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kShouldAlwaysShowAccessibilityMenu[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kAltTabPerDesk[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kContextualTooltips[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDesksNamesList[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDesksMetricsList[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDesksWeeklyActiveDesksMetrics[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDesksActiveDesk[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDockedMagnifierEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDockedMagnifierScale[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDockedMagnifierAcceleratorDialogHasBeenAccepted[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kHighContrastAcceleratorDialogHasBeenAccepted[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kScreenMagnifierAcceleratorDialogHasBeenAccepted[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDictationAcceleratorDialogHasBeenAccepted[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDisplayRotationAcceleratorDialogHasBeenAccepted[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDisplayRotationAcceleratorDialogHasBeenAccepted2[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDisplayMixedMirrorModeParams[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDisplayPowerState[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDisplayPrivacyScreenEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDisplayProperties[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDisplayRotationLock[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDisplayTouchAssociations[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kDisplayTouchPortAssociations[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kExternalDisplayMirrorInfo[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kSecondaryDisplays[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAllowMGSToStoreDisplayProperties[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kFullscreenAlertEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kGestureEducationNotificationShown[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kHasSeenStylus[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kShownPaletteWelcomeBubble[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kEnableStylusTools[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kLaunchPaletteOnEjectEvent[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kLocalStateDevicePeripheralDataAccessEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kCanCellularSetupNotificationBeShown[];
+
+// Managed-guest session privacy warning.
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kManagedGuestSessionPrivacyWarningsEnabled[];
+
+// Lock screen notification settings.
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kMessageCenterLockScreenMode[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kMessageCenterLockScreenModeShow[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kMessageCenterLockScreenModeHide[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kMessageCenterLockScreenModeHideSensitive[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kAmbientColorEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kColorModeThemed[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDarkModeEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNightLightEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNightLightTemperature[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNightLightScheduleType[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNightLightCustomStartTime[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNightLightCustomEndTime[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNightLightCachedLatitude[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNightLightCachedLongitude[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAutoNightLightNotificationDismissed[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kOsSettingsEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kAllowScreenLock[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kEnableAutoScreenLock[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerAcScreenBrightnessPercent[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAcScreenDimDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAcScreenOffDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAcScreenLockDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAcIdleWarningDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAcIdleDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerBatteryScreenBrightnessPercent[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerBatteryScreenDimDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerBatteryScreenOffDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerBatteryScreenLockDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerBatteryIdleWarningDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerBatteryIdleDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerLockScreenDimDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerLockScreenOffDelayMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAcIdleAction[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerBatteryIdleAction[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerLidClosedAction[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerUseAudioActivity[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerUseVideoActivity[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAllowWakeLocks[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAllowScreenWakeLocks[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerPresentationScreenDimDelayFactor[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerUserActivityScreenDimDelayFactor[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerWaitForInitialUserActivity[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerForceNonzeroBrightnessForUserActivity[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerFastSuspendWhenBacklightsForcedOff[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerSmartDimEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerAlsLoggingEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kShelfAlignment[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kShelfAlignmentLocal[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kShelfAutoHideBehavior[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kShelfAutoHideBehaviorLocal[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kShelfPreferences[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kShowLogoutButtonInTray[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kLogoutDialogDurationMs[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kSuggestLogoutAfterClosingLastWindow[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kUserWallpaperInfo[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kWallpaperColors[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kSyncableWallpaperInfo[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kWallpaperCollectionId[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kUserBluetoothAdapterEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kSystemBluetoothAdapterEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kTapDraggingEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kTouchpadEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kTouchscreenEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kQuickUnlockPinSalt[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kDetachableBaseDevices[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kCursorMotionBlurEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAssistantNumSessionsWhereOnboardingShown[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAssistantTimeOfLastInteraction[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kVpnConfigAllowed[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerPeakShiftEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPowerPeakShiftBatteryThreshold[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kPowerPeakShiftDayConfig[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kBootOnAcEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAdvancedBatteryChargeModeEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAdvancedBatteryChargeModeDayConfig[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kBatteryChargeMode[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kBatteryChargeCustomStartCharging[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kBatteryChargeCustomStopCharging[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kUsbPowerShareEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kSuggestedContentInfoShownInLauncher[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kSuggestedContentInfoDismissedInLauncher[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kLockScreenMediaControlsEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kXkbAutoRepeatDelay[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kXkbAutoRepeatEnabled[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kXkbAutoRepeatInterval[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kNaturalScroll[];
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kMouseReverseScroll[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kMultipasteNudges[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kAppNotificationBadgingEnabled[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const char kGlobalMediaControlsPinned[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kPciePeripheralDisplayNotificationRemaining[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kLastUsedImeShortcutReminderDismissed[];
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kNextImeShortcutReminderDismissed[];
+
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kImprovedShortcutsNotificationShownCount[];
+
 }  // namespace prefs
 }  // namespace ash
 

diff --git a/ash/detachable_base/detachable_base_handler.cc b/ash/detachable_base/detachable_base_handler.cc
index ff6e06e..5980efb 100644
--- a/ash/detachable_base/detachable_base_handler.cc
+++ b/ash/detachable_base/detachable_base_handler.cc

@@ -4,8 +4,8 @@
 
 #include "ash/detachable_base/detachable_base_handler.h"
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/detachable_base/detachable_base_observer.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/session/user_info.h"
 #include "ash/shell.h"
 #include "base/bind.h"

diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc
index 98215e49..09da0e0 100644
--- a/ash/display/cursor_window_controller.cc
+++ b/ash/display/cursor_window_controller.cc

@@ -11,12 +11,12 @@
 #include "ash/capture_mode/capture_mode_session.h"
 #include "ash/constants/ash_constants.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/display/display_color_manager.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/fast_ink/cursor/cursor_view.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/display/cursor_window_controller_unittest.cc b/ash/display/cursor_window_controller_unittest.cc
index 75d6e83..86a0fbe 100644
--- a/ash/display/cursor_window_controller_unittest.cc
+++ b/ash/display/cursor_window_controller_unittest.cc

@@ -8,9 +8,9 @@
 
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/constants/ash_constants.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/display/display_util.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/display/display_prefs.cc b/ash/display/display_prefs.cc
index 0903f65..476f69c 100644
--- a/ash/display/display_prefs.cc
+++ b/ash/display/display_prefs.cc

@@ -8,8 +8,8 @@
 
 #include <string>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "base/command_line.h"

diff --git a/ash/display/display_prefs_unittest.cc b/ash/display/display_prefs_unittest.cc
index f9efc1b8..1dfe9e0b 100644
--- a/ash/display/display_prefs_unittest.cc
+++ b/ash/display/display_prefs_unittest.cc

@@ -11,13 +11,13 @@
 #include <utility>
 #include <vector>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/display/display_configuration_observer.h"
 #include "ash/display/display_util.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/test_session_controller_client.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/display/privacy_screen_controller.cc b/ash/display/privacy_screen_controller.cc
index aba3703..87e2208 100644
--- a/ash/display/privacy_screen_controller.cc
+++ b/ash/display/privacy_screen_controller.cc

@@ -4,7 +4,7 @@
 
 #include "ash/display/privacy_screen_controller.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "base/bind.h"

diff --git a/ash/display/privacy_screen_controller_unittest.cc b/ash/display/privacy_screen_controller_unittest.cc
index 1ea52c8..4b71c3b 100644
--- a/ash/display/privacy_screen_controller_unittest.cc
+++ b/ash/display/privacy_screen_controller_unittest.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "ash/display/privacy_screen_controller.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/fast_ink/fast_ink_pointer_controller.cc b/ash/fast_ink/fast_ink_pointer_controller.cc
index d57de71..13388d6 100644
--- a/ash/fast_ink/fast_ink_pointer_controller.cc
+++ b/ash/fast_ink/fast_ink_pointer_controller.cc

@@ -4,7 +4,7 @@
 
 #include "ash/fast_ink/fast_ink_pointer_controller.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "components/prefs/pref_change_registrar.h"

diff --git a/ash/fast_ink/laser/laser_pointer_controller_unittest.cc b/ash/fast_ink/laser/laser_pointer_controller_unittest.cc
index fbf7697..e8faf33 100644
--- a/ash/fast_ink/laser/laser_pointer_controller_unittest.cc
+++ b/ash/fast_ink/laser/laser_pointer_controller_unittest.cc

@@ -4,10 +4,10 @@
 
 #include "ash/fast_ink/laser/laser_pointer_controller.h"
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/fast_ink/laser/laser_pointer_controller_test_api.h"
 #include "ash/fast_ink/laser/laser_pointer_view.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/stylus_utils.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/keyboard/keyboard_controller_impl.cc b/ash/keyboard/keyboard_controller_impl.cc
index 9bb2d07..46770bf5 100644
--- a/ash/keyboard/keyboard_controller_impl.cc
+++ b/ash/keyboard/keyboard_controller_impl.cc

@@ -7,10 +7,10 @@
 #include <utility>
 
 #include "ash/constants/ash_constants.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/keyboard/ui/keyboard_ui_factory.h"
 #include "ash/keyboard/virtual_keyboard_controller.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/keyboard/keyboard_switches.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"

diff --git a/ash/keyboard/keyboard_controller_impl_unittest.cc b/ash/keyboard/keyboard_controller_impl_unittest.cc
index aeaede30..cacb8e7c 100644
--- a/ash/keyboard/keyboard_controller_impl_unittest.cc
+++ b/ash/keyboard/keyboard_controller_impl_unittest.cc

@@ -8,10 +8,10 @@
 #include <set>
 #include <utility>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/keyboard/ui/container_behavior.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/keyboard/ui/test/keyboard_test_util.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/keyboard/keyboard_controller.h"
 #include "ash/public/cpp/test/test_keyboard_controller_observer.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/login/login_screen_controller.cc b/ash/login/login_screen_controller.cc
index 671ec86..70d7981 100644
--- a/ash/login/login_screen_controller.cc
+++ b/ash/login/login_screen_controller.cc

@@ -6,11 +6,11 @@
 
 #include <utility>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/focus_cycler.h"
 #include "ash/login/security_token_request_controller.h"
 #include "ash/login/ui/lock_screen.h"
 #include "ash/login/ui/login_data_dispatcher.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/child_accounts/parent_access_controller.h"
 #include "ash/public/cpp/login_screen_client.h"
 #include "ash/public/cpp/toast_data.h"

diff --git a/ash/login/login_screen_controller_unittest.cc b/ash/login/login_screen_controller_unittest.cc
index d7daf67..20010fd6 100644
--- a/ash/login/login_screen_controller_unittest.cc
+++ b/ash/login/login_screen_controller_unittest.cc

@@ -4,9 +4,9 @@
 
 #include "ash/login/login_screen_controller.h"
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/login/mock_login_screen_client.h"
 #include "ash/login/ui/lock_screen.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"

diff --git a/ash/login/ui/lock_contents_view_unittest.cc b/ash/login/ui/lock_contents_view_unittest.cc
index 27435f2..e1e82c7 100644
--- a/ash/login/ui/lock_contents_view_unittest.cc
+++ b/ash/login/ui/lock_contents_view_unittest.cc

@@ -11,6 +11,7 @@
 
 #include "ash/child_accounts/parent_access_controller_impl.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/detachable_base/detachable_base_pairing_status.h"
 #include "ash/login/login_screen_controller.h"
 #include "ash/login/mock_login_screen_client.h"
@@ -30,7 +31,6 @@
 #include "ash/login/ui/login_user_view.h"
 #include "ash/login/ui/scrollable_users_list_view.h"
 #include "ash/login/ui/views_utils.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/login_screen_test_api.h"
 #include "ash/public/mojom/tray_action.mojom.h"
 #include "ash/root_window_controller.h"

diff --git a/ash/login/ui/login_expanded_public_account_view.cc b/ash/login/ui/login_expanded_public_account_view.cc
index deb3f0b..078d94c 100644
--- a/ash/login/ui/login_expanded_public_account_view.cc
+++ b/ash/login/ui/login_expanded_public_account_view.cc

@@ -8,13 +8,13 @@
 #include <utility>
 #include <vector>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/login/login_screen_controller.h"
 #include "ash/login/ui/arrow_button_view.h"
 #include "ash/login/ui/login_button.h"
 #include "ash/login/ui/login_user_view.h"
 #include "ash/login/ui/public_account_monitoring_info_dialog.h"
 #include "ash/login/ui/views_utils.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/login_types.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"

diff --git a/ash/media/media_controller_impl.cc b/ash/media/media_controller_impl.cc
index 33135ce..24daadd 100644
--- a/ash/media/media_controller_impl.cc
+++ b/ash/media/media_controller_impl.cc

@@ -5,7 +5,7 @@
 #include "ash/media/media_controller_impl.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/media_client.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/media/media_controller_unittest.cc b/ash/media/media_controller_unittest.cc
index 9ae3d7ed..af52512 100644
--- a/ash/media/media_controller_unittest.cc
+++ b/ash/media/media_controller_unittest.cc

@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
index 8294475..2951224b 100644
--- a/ash/metrics/user_metrics_recorder.cc
+++ b/ash/metrics/user_metrics_recorder.cc

@@ -8,12 +8,12 @@
 #include <vector>
 
 #include "ash/app_list/app_list_metrics.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/login/ui/lock_screen.h"
 #include "ash/metrics/demo_session_metrics_recorder.h"
 #include "ash/metrics/desktop_task_switch_metric_recorder.h"
 #include "ash/metrics/pointer_metrics_recorder.h"
 #include "ash/public/cpp/accessibility_controller_enums.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shell_window_ids.h"

diff --git a/ash/policy/policy_recommendation_restorer_unittest.cc b/ash/policy/policy_recommendation_restorer_unittest.cc
index eadc02c..d57c0bc3 100644
--- a/ash/policy/policy_recommendation_restorer_unittest.cc
+++ b/ash/policy/policy_recommendation_restorer_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "ash/policy/policy_recommendation_restorer.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"

diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn
index 7b45ce49..0fe716f 100644
--- a/ash/public/cpp/BUILD.gn
+++ b/ash/public/cpp/BUILD.gn

@@ -61,8 +61,6 @@
     "arc_app_id_provider.h",
     "arc_resize_lock_type.h",
     "ash_constants.h",
-    "ash_pref_names.cc",
-    "ash_pref_names.h",
     "ash_public_export.h",
     "ash_typography.cc",
     "ash_typography.h",

diff --git a/ash/public/cpp/ash_pref_names.cc b/ash/public/cpp/ash_pref_names.cc
deleted file mode 100644
index eee0635..0000000
--- a/ash/public/cpp/ash_pref_names.cc
+++ /dev/null

@@ -1,660 +0,0 @@
-// Copyright 2017 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.
-
-#include "ash/public/cpp/ash_pref_names.h"
-
-namespace ash {
-
-namespace prefs {
-
-// A boolean pref which determines whether the large cursor feature is enabled.
-const char kAccessibilityLargeCursorEnabled[] =
-    "settings.a11y.large_cursor_enabled";
-// An integer pref that specifies the size of large cursor for accessibility.
-const char kAccessibilityLargeCursorDipSize[] =
-    "settings.a11y.large_cursor_dip_size";
-// A boolean pref which determines whether the sticky keys feature is enabled.
-const char kAccessibilityStickyKeysEnabled[] =
-    "settings.a11y.sticky_keys_enabled";
-// A boolean pref which determines whether spoken feedback is enabled.
-const char kAccessibilitySpokenFeedbackEnabled[] = "settings.accessibility";
-// A boolean pref which determines whether high contrast is enabled.
-const char kAccessibilityHighContrastEnabled[] =
-    "settings.a11y.high_contrast_enabled";
-// A boolean pref which determines whether screen magnifier is enabled.
-// NOTE: We previously had prefs named settings.a11y.screen_magnifier_type and
-// settings.a11y.screen_magnifier_type2, but we only shipped one type (full).
-// See http://crbug.com/170850 for history.
-const char kAccessibilityScreenMagnifierEnabled[] =
-    "settings.a11y.screen_magnifier";
-// A boolean pref which determines whether focus following for screen magnifier
-// is enabled.
-const char kAccessibilityScreenMagnifierFocusFollowingEnabled[] =
-    "settings.a11y.screen_magnifier_focus_following";
-// An integer pref which indicates the mouse following mode for screen
-// magnifier. This maps to AccessibilityController::MagnifierMouseFollowingMode.
-const char kAccessibilityScreenMagnifierMouseFollowingMode[] =
-    "settings.a11y.screen_magnifier_mouse_following_mode";
-// A boolean pref which determines whether screen magnifier should center
-// the text input focus.
-const char kAccessibilityScreenMagnifierCenterFocus[] =
-    "settings.a11y.screen_magnifier_center_focus";
-// A double pref which determines a zooming scale of the screen magnifier.
-const char kAccessibilityScreenMagnifierScale[] =
-    "settings.a11y.screen_magnifier_scale";
-// A boolean pref which determines whether the virtual keyboard is enabled for
-// accessibility.  This feature is separate from displaying an onscreen keyboard
-// due to lack of a physical keyboard.
-const char kAccessibilityVirtualKeyboardEnabled[] =
-    "settings.a11y.virtual_keyboard";
-// A pref that identifies which kind of features are enabled for the Web Kiosk
-// session.
-const char kAccessibilityVirtualKeyboardFeatures[] =
-    "settings.a11y.virtual_keyboard_features";
-// A boolean pref which determines whether the mono audio output is enabled for
-// accessibility.
-const char kAccessibilityMonoAudioEnabled[] = "settings.a11y.mono_audio";
-// A boolean pref which determines whether autoclick is enabled.
-const char kAccessibilityAutoclickEnabled[] = "settings.a11y.autoclick";
-// A boolean pref which determines whether the accessibility shortcuts are
-// enabled or not.
-const char kAccessibilityShortcutsEnabled[] = "settings.a11y.shortcuts_enabled";
-// An integer pref which determines time in ms between when the mouse cursor
-// stops and when an autoclick event is triggered.
-const char kAccessibilityAutoclickDelayMs[] =
-    "settings.a11y.autoclick_delay_ms";
-// An integer pref which determines the event type for an autoclick event. This
-// maps to AccessibilityController::AutoclickEventType.
-const char kAccessibilityAutoclickEventType[] =
-    "settings.a11y.autoclick_event_type";
-// Whether Autoclick should immediately return to left click after performing
-// another event type action, or whether it should stay as the other event type.
-const char kAccessibilityAutoclickRevertToLeftClick[] =
-    "settings.a11y.autoclick_revert_to_left_click";
-// Whether Autoclick should stabilize the cursor movement before a click occurs
-// or not.
-const char kAccessibilityAutoclickStabilizePosition[] =
-    "settings.a11y.autoclick_stabilize_position";
-// The default threshold of mouse movement, measured in DIP, that will initiate
-// a new autoclick.
-const char kAccessibilityAutoclickMovementThreshold[] =
-    "settings.a11y.autoclick_movement_threshold";
-// The Autoclick menu position on the screen, an AutoclickMenuPosition.
-const char kAccessibilityAutoclickMenuPosition[] =
-    "settings.a11y.autoclick_menu_position";
-// A boolean pref which determines whether caret highlighting is enabled.
-const char kAccessibilityCaretHighlightEnabled[] =
-    "settings.a11y.caret_highlight";
-// A boolean pref which determines whether cursor highlighting is enabled.
-const char kAccessibilityCursorHighlightEnabled[] =
-    "settings.a11y.cursor_highlight";
-// A boolean pref which determines whether custom cursor color is enabled.
-const char kAccessibilityCursorColorEnabled[] =
-    "settings.a11y.cursor_color_enabled";
-// An integer pref which determines the custom cursor color.
-const char kAccessibilityCursorColor[] = "settings.a11y.cursor_color";
-// A boolean pref which determines whether floating accessibility menu is
-// enabled.
-const char kAccessibilityFloatingMenuEnabled[] = "settings.a11y.floating_menu";
-// Floating a11y menu position, a FloatingMenuPosition;
-const char kAccessibilityFloatingMenuPosition[] =
-    "settings.a11y.floating_menu_position";
-// A boolean pref which determines whether focus highlighting is enabled.
-const char kAccessibilityFocusHighlightEnabled[] =
-    "settings.a11y.focus_highlight";
-// A boolean pref which determines whether select-to-speak is enabled.
-const char kAccessibilitySelectToSpeakEnabled[] =
-    "settings.a11y.select_to_speak";
-// A boolean pref which determines whether Switch Access is enabled.
-const char kAccessibilitySwitchAccessEnabled[] =
-    "settings.a11y.switch_access.enabled";
-// A dictionary pref keyed on a key code mapped to a list value of device types
-// for the "select" action.
-const char kAccessibilitySwitchAccessSelectDeviceKeyCodes[] =
-    "settings.a11y.switch_access.select.device_key_codes";
-// A dictionary pref keyed on a key code mapped to a list value of device types
-// for the "next" action.
-const char kAccessibilitySwitchAccessNextDeviceKeyCodes[] =
-    "settings.a11y.switch_access.next.device_key_codes";
-// A dictionary pref keyed on a key code mapped to a list value of device types
-// for the "previous" action.
-const char kAccessibilitySwitchAccessPreviousDeviceKeyCodes[] =
-    "settings.a11y.switch_access.previous.device_key_codes";
-// A boolean pref which determines whether auto-scanning is enabled within
-// Switch Access.
-const char kAccessibilitySwitchAccessAutoScanEnabled[] =
-    "settings.a11y.switch_access.auto_scan.enabled";
-// An integer pref which determines time delay in ms before automatically
-// scanning forward (when auto-scan is enabled).
-const char kAccessibilitySwitchAccessAutoScanSpeedMs[] =
-    "settings.a11y.switch_access.auto_scan.speed_ms";
-// An integer pref which determines time delay in ms before automatically
-// scanning forward while navigating the keyboard (when auto-scan is
-// enabled).
-const char kAccessibilitySwitchAccessAutoScanKeyboardSpeedMs[] =
-    "settings.a11y.switch_access.auto_scan.keyboard.speed_ms";
-// An integer pref which determines speed in dips per second that the gliding
-// point scan cursor in switch access moves across the screen.
-const char kAccessibilitySwitchAccessPointScanSpeedDipsPerSecond[] =
-    "settings.a11y.switch_access.point_scan.speed_dips_per_second";
-// A boolean pref which, if set, indicates that shelf navigation buttons (home,
-// back and overview button) should be shown in tablet mode. Note that shelf
-// buttons might be shown even if the pref value is false - for example, if
-// spoken feedback, autoclick or switch access are enabled.
-const char kAccessibilityTabletModeShelfNavigationButtonsEnabled[] =
-    "settings.a11y.tablet_mode_shelf_nav_buttons_enabled";
-// A boolean pref which determines whether dictation is enabled.
-const char kAccessibilityDictationEnabled[] = "settings.a11y.dictation";
-// A string pref which determines the locale used for dictation speech
-// recognition. Should be BCP-47 format, e.g. "en-US" or "es-ES".
-const char kAccessibilityDictationLocale[] = "settings.a11y.dictation_locale";
-// A boolean pref which determines whether the accessibility menu shows
-// regardless of the state of a11y features.
-const char kShouldAlwaysShowAccessibilityMenu[] = "settings.a11y.enable_menu";
-
-// A boolean pref which determines whether alt-tab should show only windows in
-// the current desk or all windows.
-const char kAltTabPerDesk[] = "ash.alttab.per_desk";
-
-// A dictionary storing the number of times and most recent time all contextual
-// tooltips have been shown.
-const char kContextualTooltips[] = "settings.contextual_tooltip.shown_info";
-
-// A list containing the stored virtual desks names in the same order of the
-// desks in the overview desks bar. This list will be used to restore the desks,
-// their order, and their names for the primary user on first signin. If a desk
-// hasn't been renamed by the user (i.e. it uses one of the default
-// automatically-assigned desk names such as "Desk 1", "Desk 2", ... etc.), its
-// name will appear in this list as an empty string. The desk names are stored
-// as UTF8 strings.
-const char kDesksNamesList[] = "ash.desks.desks_names_list";
-// This list stores the metrics of virtual desks. Like |kDesksNamesList|, this
-// list stores entries in the same order of the desks in the overview desks bar.
-// Values are stored as dictionaries.
-const char kDesksMetricsList[] = "ash.desks.desks_metrics_list";
-// A dict pref storing the metrics related to the weekly active desks of a user.
-const char kDesksWeeklyActiveDesksMetrics[] = "ash.desks.weekly_active_desks";
-// An integer index of a user's active desk.
-const char kDesksActiveDesk[] = "ash.desks.active_desk";
-
-// A boolean pref storing the enabled status of the Docked Magnifier feature.
-const char kDockedMagnifierEnabled[] = "ash.docked_magnifier.enabled";
-// A double pref storing the scale value of the Docked Magnifier feature by
-// which the screen is magnified.
-const char kDockedMagnifierScale[] = "ash.docked_magnifier.scale";
-
-// A boolean pref which indicates whether the docked magnifier confirmation
-// dialog has ever been shown.
-const char kDockedMagnifierAcceleratorDialogHasBeenAccepted[] =
-    "settings.a11y.docked_magnifier_accelerator_dialog_has_been_accepted";
-// A boolean pref which indicates whether the high contrast magnifier
-// confirmation dialog has ever been shown.
-const char kHighContrastAcceleratorDialogHasBeenAccepted[] =
-    "settings.a11y.high_contrast_accelerator_dialog_has_been_accepted";
-// A boolean pref which indicates whether the screen magnifier confirmation
-// dialog has ever been shown.
-const char kScreenMagnifierAcceleratorDialogHasBeenAccepted[] =
-    "settings.a11y.screen_magnifier_accelerator_dialog_has_been_accepted";
-// A boolean pref which indicates whether the dictation confirmation dialog has
-// ever been shown.
-const char kDictationAcceleratorDialogHasBeenAccepted[] =
-    "settings.a11y.dictation_accelerator_dialog_has_been_accepted";
-// A boolean pref which indicates whether the display rotation confirmation
-// dialog has ever been shown.
-// Renamed 10/2019 to force reset the pref to false.
-const char kDisplayRotationAcceleratorDialogHasBeenAccepted2[] =
-    "settings.a11y.display_rotation_accelerator_dialog_has_been_accepted2";
-
-// A dictionary pref that stores the mixed mirror mode parameters.
-const char kDisplayMixedMirrorModeParams[] =
-    "settings.display.mixed_mirror_mode_param";
-// Power state of the current displays from the last run.
-const char kDisplayPowerState[] = "settings.display.power_state";
-// A dictionary pref that stores per display preferences.
-const char kDisplayProperties[] = "settings.display.properties";
-// Boolean controlling whether privacy screen is enabled.
-const char kDisplayPrivacyScreenEnabled[] =
-    "settings.display.privacy_screen_enabled";
-// A dictionary pref that specifies the state of the rotation lock, and the
-// display orientation, for the internal display.
-const char kDisplayRotationLock[] = "settings.display.rotation_lock";
-// A dictionary pref that stores the touch associations for the device.
-const char kDisplayTouchAssociations[] = "settings.display.touch_associations";
-// A dictionary pref that stores the port mapping for touch devices.
-const char kDisplayTouchPortAssociations[] =
-    "settings.display.port_associations";
-// A list pref that stores the mirror info for each external display.
-const char kExternalDisplayMirrorInfo[] =
-    "settings.display.external_display_mirror_info";
-// A dictionary pref that specifies per-display layout/offset information.
-// Its key is the ID of the display and its value is a dictionary for the
-// layout/offset information.
-const char kSecondaryDisplays[] = "settings.display.secondary_displays";
-// A boolean pref which determines whether the display configuration set by
-// managed guest session should be stored in local state.
-const char kAllowMGSToStoreDisplayProperties[] =
-    "settings.display.allow_mgs_to_store";
-
-// A boolean pref that enable fullscreen alert bubble.
-// TODO(zxdan): Change to an allowlist in M89.
-const char kFullscreenAlertEnabled[] = "ash.fullscreen_alert_enabled";
-
-// A boolean pref storing whether the gesture education notification has ever
-// been shown to the user, which we use to stop showing it again.
-const char kGestureEducationNotificationShown[] =
-    "ash.gesture_education.notification_shown";
-
-// A boolean pref which stores whether a stylus has been seen before.
-const char kHasSeenStylus[] = "ash.has_seen_stylus";
-// A boolean pref which stores whether a the palette warm welcome bubble
-// (displayed when a user first uses a stylus) has been shown before.
-const char kShownPaletteWelcomeBubble[] = "ash.shown_palette_welcome_bubble";
-// A boolean pref that specifies if the stylus tools should be enabled/disabled.
-const char kEnableStylusTools[] = "settings.enable_stylus_tools";
-// A boolean pref that specifies if the ash palette should be launched after an
-// eject input event has been received.
-const char kLaunchPaletteOnEjectEvent[] =
-    "settings.launch_palette_on_eject_event";
-
-// Boolean pref indicating whether the PCI tunneling is allowed for external
-// Thunderbolt/USB4 peripherals. This pref is only used if the policy
-// "DevicePciPeripheralDataAccessEnabled" is set to "unset".
-const char kLocalStateDevicePeripheralDataAccessEnabled[] =
-    "settings.local_state_device_pci_data_access_enabled";
-
-// A boolean pref that specifies if the cellular setup notification can be
-// shown or not. This notification should be shown post-OOBE if the user has a
-// cellular-capable device but no available cellular networks. It should only be
-// shown at most once per user.
-const char kCanCellularSetupNotificationBeShown[] =
-    "ash.cellular_setup.can_setup_notification_be_shown";
-
-// Boolean pref indicating whether the privacy warning of the managed-guest
-// session on both; the login screen and inside the auto-launched session,
-// should be displayed or not.
-const char kManagedGuestSessionPrivacyWarningsEnabled[] =
-    "managed_session.privacy_warning_enabled";
-
-// A string pref storing the type of lock screen notification mode.
-// "show" -> show notifications on the lock screen
-// "hide" -> hide notifications at all on the lock screen (default)
-// "hideSensitive" -> hide sensitive content on the lock screen
-// (other values are treated as "hide")
-const char kMessageCenterLockScreenMode[] =
-    "ash.message_center.lock_screen_mode";
-
-// Value of each options of the lock screen notification settings. They are
-// used the pref of ash::prefs::kMessageCenterLockScreenMode.
-const char kMessageCenterLockScreenModeShow[] = "show";
-const char kMessageCenterLockScreenModeHide[] = "hide";
-const char kMessageCenterLockScreenModeHideSensitive[] = "hideSensitive";
-
-// A boolean pref storing the enabled status of the ambient color feature.
-const char kAmbientColorEnabled[] = "ash.ambient_color.enabled";
-
-// A boolean pref used when dark light mode feature is enabled to indicate
-// whether the color mode is themed. If true, the background color will be
-// calculated based on extracted wallpaper color.
-const char kColorModeThemed[] = "ash.dark_mode.color_mode_themed";
-
-// A boolean pref that indicates whether dark mode is enabled.
-const char kDarkModeEnabled[] = "ash.dark_mode.enabled";
-
-// A boolean pref storing the enabled status of the NightLight feature.
-const char kNightLightEnabled[] = "ash.night_light.enabled";
-
-// A double pref storing the screen color temperature set by the NightLight
-// feature. The expected values are in the range of 0.0 (least warm) and 1.0
-// (most warm).
-const char kNightLightTemperature[] = "ash.night_light.color_temperature";
-
-// An integer pref storing the type of automatic scheduling of turning on and
-// off the NightLight feature. Valid values are:
-// 0 -> NightLight is never turned on or off automatically.
-// 1 -> NightLight is turned on and off at the sunset and sunrise times
-// respectively.
-// 2 -> NightLight schedule times are explicitly set by the user.
-//
-// See ash::NightLightController::ScheduleType.
-const char kNightLightScheduleType[] = "ash.night_light.schedule_type";
-
-// Integer prefs storing the start and end times of the automatic schedule at
-// which NightLight turns on and off respectively when the schedule type is set
-// to a custom schedule. The times are represented as the number of minutes from
-// 00:00 (12:00 AM) regardless of the date or the timezone.
-// See ash::TimeOfDayTime.
-const char kNightLightCustomStartTime[] = "ash.night_light.custom_start_time";
-const char kNightLightCustomEndTime[] = "ash.night_light.custom_end_time";
-
-// Double prefs storing the most recent valid geoposition, which is only used
-// when the device lacks connectivity and we're unable to retrieve a valid
-// geoposition to calculate the sunset / sunrise times.
-const char kNightLightCachedLatitude[] = "ash.night_light.cached_latitude";
-const char kNightLightCachedLongitude[] = "ash.night_light.cached_longitude";
-
-// A boolean pref storing whether the AutoNightLight notification has ever been
-// dismissed by the user, which we use to stop showing it again.
-const char kAutoNightLightNotificationDismissed[] =
-    "ash.auto_night_light.notification_dismissed";
-
-// Whether the Chrome OS lock screen is allowed.
-const char kAllowScreenLock[] = "allow_screen_lock";
-
-// A boolean pref that turns on automatic screen locking.
-const char kEnableAutoScreenLock[] = "settings.enable_screen_lock";
-
-// Screen brightness percent values to be used when running on AC power.
-// Specified by the policy.
-const char kPowerAcScreenBrightnessPercent[] =
-    "power.ac_screen_brightness_percent";
-
-// Inactivity time in milliseconds while the system is on AC power before
-// the screen should be dimmed, turned off, or locked, before an
-// IdleActionImminent D-Bus signal should be sent, or before
-// kPowerAcIdleAction should be performed.  0 disables the delay (N/A for
-// kPowerAcIdleDelayMs).
-const char kPowerAcScreenDimDelayMs[] = "power.ac_screen_dim_delay_ms";
-const char kPowerAcScreenOffDelayMs[] = "power.ac_screen_off_delay_ms";
-const char kPowerAcScreenLockDelayMs[] = "power.ac_screen_lock_delay_ms";
-const char kPowerAcIdleWarningDelayMs[] = "power.ac_idle_warning_delay_ms";
-
-// Screen brightness percent values to be used when running on battery power.
-// Specified by the policy.
-const char kPowerBatteryScreenBrightnessPercent[] =
-    "power.battery_screen_brightness_percent";
-
-// Similar delays while the system is on battery power.
-const char kPowerBatteryScreenDimDelayMs[] =
-    "power.battery_screen_dim_delay_ms";
-const char kPowerBatteryScreenOffDelayMs[] =
-    "power.battery_screen_off_delay_ms";
-const char kPowerBatteryScreenLockDelayMs[] =
-    "power.battery_screen_lock_delay_ms";
-const char kPowerBatteryIdleWarningDelayMs[] =
-    "power.battery_idle_warning_delay_ms";
-const char kPowerBatteryIdleDelayMs[] = "power.battery_idle_delay_ms";
-const char kPowerAcIdleDelayMs[] = "power.ac_idle_delay_ms";
-
-// Inactivity delays used to dim the screen or turn it off while the screen is
-// locked.
-const char kPowerLockScreenDimDelayMs[] = "power.lock_screen_dim_delay_ms";
-const char kPowerLockScreenOffDelayMs[] = "power.lock_screen_off_delay_ms";
-
-// Action that should be performed when the idle delay is reached while the
-// system is on AC power or battery power.
-// Values are from the chromeos::PowerPolicyController::Action enum.
-const char kPowerAcIdleAction[] = "power.ac_idle_action";
-const char kPowerBatteryIdleAction[] = "power.battery_idle_action";
-
-// Action that should be performed when the lid is closed.
-// Values are from the chromeos::PowerPolicyController::Action enum.
-const char kPowerLidClosedAction[] = "power.lid_closed_action";
-
-// Should audio and video activity be used to disable the above delays?
-const char kPowerUseAudioActivity[] = "power.use_audio_activity";
-const char kPowerUseVideoActivity[] = "power.use_video_activity";
-
-// Should extensions, ARC apps, and other code within Chrome be able to override
-// system power management (preventing automatic actions like sleeping, locking,
-// or screen dimming)?
-const char kPowerAllowWakeLocks[] = "power.allow_wake_locks";
-
-// Should extensions, ARC apps, and other code within Chrome be able to override
-// display-related power management? (Disallowing wake locks in general takes
-// precedence over this.)
-const char kPowerAllowScreenWakeLocks[] = "power.allow_screen_wake_locks";
-
-// Amount by which the screen-dim delay should be scaled while the system
-// is in presentation mode. Values are limited to a minimum of 1.0.
-const char kPowerPresentationScreenDimDelayFactor[] =
-    "power.presentation_screen_dim_delay_factor";
-
-// Amount by which the screen-dim delay should be scaled when user activity is
-// observed while the screen is dimmed or soon after the screen has been turned
-// off.  Values are limited to a minimum of 1.0.
-const char kPowerUserActivityScreenDimDelayFactor[] =
-    "power.user_activity_screen_dim_delay_factor";
-
-// Whether the power management delays should start running only after the first
-// user activity has been observed in a session.
-const char kPowerWaitForInitialUserActivity[] =
-    "power.wait_for_initial_user_activity";
-
-// Boolean controlling whether the panel backlight should be forced to a
-// nonzero level when user activity is observed.
-const char kPowerForceNonzeroBrightnessForUserActivity[] =
-    "power.force_nonzero_brightness_for_user_activity";
-
-// Boolean controlling whether a shorter suspend delay should be used after the
-// user forces the display off by pressing the power button. Provided to allow
-// policy to control this behavior.
-const char kPowerFastSuspendWhenBacklightsForcedOff[] =
-    "power.fast_suspend_when_backlights_forced_off";
-
-// Boolean controlling whether smart dim model is enabled.
-const char kPowerSmartDimEnabled[] = "power.smart_dim_enabled";
-
-// Boolean controlling whether ALS logging is enabled.
-const char kPowerAlsLoggingEnabled[] = "power.als_logging_enabled";
-
-// Boolean controlling whether the settings is enabled. This pref is intended to
-// be set only by policy not by user.
-const char kOsSettingsEnabled[] = "os_settings_enabled";
-
-// |kShelfAlignment| and |kShelfAutoHideBehavior| have a local variant. The
-// local variant is not synced and is used if set. If the local variant is not
-// set its value is set from the synced value (once prefs have been
-// synced). This gives a per-machine setting that is initialized from the last
-// set value.
-// These values are default on the machine but can be overridden by per-display
-// values in kShelfPreferences (unless overridden by managed policy).
-// String value corresponding to ash::ShelfAlignment (e.g. "Bottom").
-const char kShelfAlignment[] = "shelf_alignment";
-const char kShelfAlignmentLocal[] = "shelf_alignment_local";
-// String value corresponding to ash::ShelfAutoHideBehavior (e.g. "Never").
-const char kShelfAutoHideBehavior[] = "auto_hide_behavior";
-const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local";
-// Dictionary value that holds per-display preference of shelf alignment and
-// auto-hide behavior. Key of the dictionary is the id of the display, and
-// its value is a dictionary whose keys are kShelfAlignment and
-// kShelfAutoHideBehavior.
-const char kShelfPreferences[] = "shelf_preferences";
-
-// Boolean pref indicating whether to show a logout button in the system tray.
-const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray";
-
-// Integer pref indicating the length of time in milliseconds for which a
-// confirmation dialog should be shown when the user presses the logout button.
-// A value of 0 indicates that logout should happen immediately, without showing
-// a confirmation dialog.
-const char kLogoutDialogDurationMs[] = "logout_dialog_duration_ms";
-
-// A boolean pref that when set to true, displays the logout confirmation
-// dialog. If set to false, it prevents showing the dialog and the subsequent
-// logout after closing the last window.
-const char kSuggestLogoutAfterClosingLastWindow[] =
-    "suggest_logout_after_closing_last_window";
-
-// A dictionary pref that maps usernames to wallpaper info.
-const char kUserWallpaperInfo[] = "user_wallpaper_info";
-
-// A dictionary pref that maps usernames to wallpaper info.
-// This is for wallpapers that are syncable across devices.
-const char kSyncableWallpaperInfo[] = "syncable_wallpaper_info";
-
-// A dictionary pref that maps wallpaper file paths to their prominent colors.
-const char kWallpaperColors[] = "ash.wallpaper.prominent_colors";
-
-// String pref storing the collection_id used to query for new wallpapers when
-// daily refresh is enabled.
-const char kWallpaperCollectionId[] = "ash.wallpaper.collection_id";
-
-// Boolean pref indicating whether a user has enabled the bluetooth adapter.
-const char kUserBluetoothAdapterEnabled[] =
-    "ash.user.bluetooth.adapter_enabled";
-
-// Boolean pref indicating system-wide setting for bluetooth adapter power.
-const char kSystemBluetoothAdapterEnabled[] =
-    "ash.system.bluetooth.adapter_enabled";
-
-// A boolean pref which determines whether tap-dragging is enabled.
-const char kTapDraggingEnabled[] = "settings.touchpad.enable_tap_dragging";
-
-// Boolean prefs for the status of the touchscreen and the touchpad.
-const char kTouchpadEnabled[] = "events.touch_pad.enabled";
-const char kTouchscreenEnabled[] = "events.touch_screen.enabled";
-
-// String pref storing the salt for the pin quick unlock mechanism.
-const char kQuickUnlockPinSalt[] = "quick_unlock.pin.salt";
-
-// Dictionary prefs in local state that keeps information about detachable
-// bases - for exmaple the last used base per user.
-const char kDetachableBaseDevices[] = "ash.detachable_base.devices";
-
-// Pref storing the number of sessions in which Assistant onboarding was shown.
-const char kAssistantNumSessionsWhereOnboardingShown[] =
-    "ash.assistant.num_sessions_where_onboarding_shown";
-
-// Pref storing the time of the last Assistant interaction.
-const char kAssistantTimeOfLastInteraction[] =
-    "ash.assistant.time_of_last_interaction";
-
-// Whether the user is allowed to disconnect and configure VPN connections.
-const char kVpnConfigAllowed[] = "vpn_config_allowed";
-
-// A boolean pref that indicates whether power peak shift is enabled.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kPowerPeakShiftEnabled[] = "ash.power.peak_shift_enabled";
-
-// An integer pref that specifies the power peak shift battery threshold in
-// percent.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kPowerPeakShiftBatteryThreshold[] =
-    "ash.power.peak_shift_battery_threshold";
-
-// A dictionary pref that specifies the power peak shift day configs.
-// For details see "DevicePowerPeakShiftDayConfig" in policy_templates.json.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kPowerPeakShiftDayConfig[] = "ash.power.peak_shift_day_config";
-
-// A boolean pref that indicates whether boot on AC is enabled.
-const char kBootOnAcEnabled[] = "ash.power.boot_on_ac_enabled";
-
-// A boolean pref that indicates whether advanced battery charge mode is
-// enabled.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kAdvancedBatteryChargeModeEnabled[] =
-    "ash.power.advanced_battery_charge_mode_enabled";
-
-// A dictionary pref that specifies the advanced battery charge mode day config.
-// For details see "DeviceAdvancedBatteryChargeModeDayConfig" in
-// policy_templates.json.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kAdvancedBatteryChargeModeDayConfig[] =
-    "ash.power.advanced_battery_charge_mode_day_config";
-
-// An integer pref that specifies the battery charge mode.
-// For details see "DeviceBatteryChargeMode" in policy_templates.json.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kBatteryChargeMode[] = "ash.power.battery_charge_mode";
-
-// An integer pref that specifies the battery charge custom start charging in
-// percent.
-// For details see "DeviceBatteryChargeCustomStartCharging" in
-// policy_templates.json.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kBatteryChargeCustomStartCharging[] =
-    "ash.power.battery_charge_custom_start_charging";
-
-// An integer pref that specifies the battery charge custom stop charging in
-// percent.
-// For details see "DeviceBatteryChargeCustomStopCharging" in
-// policy_templates.json.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kBatteryChargeCustomStopCharging[] =
-    "ash.power.battery_charge_custom_stop_charging";
-
-// A boolean pref that indicates whether USB power share is enabled.
-// For details see "DeviceUsbPowerShareEnabled" in policy_templates.json.
-// Ignored unless powerd is configured to honor charging-related prefs.
-const char kUsbPowerShareEnabled[] = "ash.power.usb_power_share_enabled";
-
-// An integer pref that specifies how many times the Suggested Content privacy
-// info has been shown in Launcher. This value will increment by one every time
-// when Launcher changes state from Peeking to Half or FullscreenSearch up to a
-// predefined threshold, e.g. six times. If the info has been shown for more
-// than the threshold, do not show the privacy info any more.
-const char kSuggestedContentInfoShownInLauncher[] =
-    "ash.launcher.suggested_content_info_shown";
-
-// A boolean pref that indicates whether the Suggested Content privacy info may
-// be displayed to user. A false value indicates that the info can be displayed
-// if the value of |kSuggestedContentInfoShownInLauncher| is smaller than the
-// predefined threshold. A true value implies that the user has dismissed the
-// info view, and do not show the privacy info any more.
-const char kSuggestedContentInfoDismissedInLauncher[] =
-    "ash.launcher.suggested_content_info_dismissed";
-
-// A boolean pref that indicates whether lock screen media controls are enabled.
-// Controlled by user policy.
-const char kLockScreenMediaControlsEnabled[] =
-    "ash.lock_screen_media_controls_enabled";
-
-// Boolean pref which determines whether key repeat is enabled.
-const char kXkbAutoRepeatEnabled[] =
-    "settings.language.xkb_auto_repeat_enabled_r2";
-
-// Integer pref which determines key repeat delay (in ms).
-const char kXkbAutoRepeatDelay[] = "settings.language.xkb_auto_repeat_delay_r2";
-
-// Integer pref which determines key repeat interval (in ms).
-const char kXkbAutoRepeatInterval[] =
-    "settings.language.xkb_auto_repeat_interval_r2";
-// "_r2" suffixes were added to the three prefs above when we changed the
-// preferences to not be user-configurable or sync with the cloud. The prefs are
-// now user-configurable and syncable again, but we don't want to overwrite the
-// current values with the old synced values, so we continue to use this suffix.
-
-// A boolean pref which is true if touchpad reverse scroll is enabled.
-const char kNaturalScroll[] = "settings.touchpad.natural_scroll";
-// A boolean pref which is true if mouse reverse scroll is enabled.
-const char kMouseReverseScroll[] = "settings.mouse.reverse_scroll";
-
-// A dictionary storing the number of times and most recent time the multipaste
-// contextual nudge was shown.
-const char kMultipasteNudges[] = "ash.clipboard.multipaste_nudges";
-
-// A boolean pref that indicates whether app badging is shown in launcher and
-// shelf.
-const char kAppNotificationBadgingEnabled[] =
-    "ash.app_notification_badging_enabled";
-
-// An integer pref that indicates whether global media controls is pinned to
-// shelf or it's unset and need to be determined by screen size during runtime.
-const char kGlobalMediaControlsPinned[] =
-    "ash.system.global_media_controls_pinned";
-
-// An integer pref that tracks how many times the user is able to click on
-// PciePeripheral-related notifications before hiding new notifications.
-const char kPciePeripheralDisplayNotificationRemaining[] =
-    "ash.pcie_peripheral_display_notification_remaining";
-
-// Boolean prefs storing whether various IME-related keyboard shortcut reminders
-// have previously been dismissed or not.
-const char kLastUsedImeShortcutReminderDismissed[] =
-    "ash.shortcut_reminders.last_used_ime_dismissed";
-const char kNextImeShortcutReminderDismissed[] =
-    "ash.shortcut_reminders.next_ime_dismissed";
-
-// An integet pref that tracks how many times the user has been shown the
-// notification about shortcuts changing.
-const char kImprovedShortcutsNotificationShownCount[] =
-    "ash.improved_shortcuts_notification_shown_count";
-
-// NOTE: New prefs should start with the "ash." prefix. Existing prefs moved
-// into this file should not be renamed, since they may be synced.
-
-}  // namespace prefs
-
-}  // namespace ash

diff --git a/ash/public/cpp/ash_pref_names.h b/ash/public/cpp/ash_pref_names.h
deleted file mode 100644
index 616527d4..0000000
--- a/ash/public/cpp/ash_pref_names.h
+++ /dev/null

@@ -1,245 +0,0 @@
-// Copyright 2017 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 ASH_PUBLIC_CPP_ASH_PREF_NAMES_H_
-#define ASH_PUBLIC_CPP_ASH_PREF_NAMES_H_
-
-#include "ash/public/cpp/ash_public_export.h"
-
-namespace ash {
-
-namespace prefs {
-
-ASH_PUBLIC_EXPORT extern const char kAccessibilityLargeCursorEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityLargeCursorDipSize[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityStickyKeysEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilitySpokenFeedbackEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityHighContrastEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityScreenMagnifierCenterFocus[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityScreenMagnifierEnabled[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilityScreenMagnifierFocusFollowingEnabled[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilityScreenMagnifierMouseFollowingMode[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityScreenMagnifierScale[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityVirtualKeyboardEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityVirtualKeyboardFeatures[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityMonoAudioEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityAutoclickEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityShortcutsEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityAutoclickDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityAutoclickEventType[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityAutoclickRevertToLeftClick[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityAutoclickStabilizePosition[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityAutoclickMovementThreshold[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityAutoclickMenuPosition[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityCaretHighlightEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityCursorHighlightEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityCursorColorEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityCursorColor[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityFloatingMenuEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityFloatingMenuPosition[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityFocusHighlightEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilitySelectToSpeakEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilitySwitchAccessEnabled[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilitySwitchAccessSelectDeviceKeyCodes[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilitySwitchAccessNextDeviceKeyCodes[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilitySwitchAccessPreviousDeviceKeyCodes[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilitySwitchAccessAutoScanEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilitySwitchAccessAutoScanSpeedMs[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilitySwitchAccessAutoScanKeyboardSpeedMs[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilitySwitchAccessPointScanSpeedDipsPerSecond[];
-ASH_PUBLIC_EXPORT extern const char
-    kAccessibilityTabletModeShelfNavigationButtonsEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityDictationEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAccessibilityDictationLocale[];
-ASH_PUBLIC_EXPORT extern const char kShouldAlwaysShowAccessibilityMenu[];
-
-ASH_PUBLIC_EXPORT extern const char kAltTabPerDesk[];
-
-ASH_PUBLIC_EXPORT extern const char kContextualTooltips[];
-
-ASH_PUBLIC_EXPORT extern const char kDesksNamesList[];
-ASH_PUBLIC_EXPORT extern const char kDesksMetricsList[];
-ASH_PUBLIC_EXPORT extern const char kDesksWeeklyActiveDesksMetrics[];
-ASH_PUBLIC_EXPORT extern const char kDesksActiveDesk[];
-
-ASH_PUBLIC_EXPORT extern const char kDockedMagnifierEnabled[];
-ASH_PUBLIC_EXPORT extern const char kDockedMagnifierScale[];
-ASH_PUBLIC_EXPORT extern const char
-    kDockedMagnifierAcceleratorDialogHasBeenAccepted[];
-ASH_PUBLIC_EXPORT extern const char
-    kHighContrastAcceleratorDialogHasBeenAccepted[];
-ASH_PUBLIC_EXPORT extern const char
-    kScreenMagnifierAcceleratorDialogHasBeenAccepted[];
-ASH_PUBLIC_EXPORT extern const char
-    kDictationAcceleratorDialogHasBeenAccepted[];
-ASH_PUBLIC_EXPORT extern const char
-    kDisplayRotationAcceleratorDialogHasBeenAccepted[];
-ASH_PUBLIC_EXPORT extern const char
-    kDisplayRotationAcceleratorDialogHasBeenAccepted2[];
-
-ASH_PUBLIC_EXPORT extern const char kDisplayMixedMirrorModeParams[];
-ASH_PUBLIC_EXPORT extern const char kDisplayPowerState[];
-ASH_PUBLIC_EXPORT extern const char kDisplayPrivacyScreenEnabled[];
-ASH_PUBLIC_EXPORT extern const char kDisplayProperties[];
-ASH_PUBLIC_EXPORT extern const char kDisplayRotationLock[];
-ASH_PUBLIC_EXPORT extern const char kDisplayTouchAssociations[];
-ASH_PUBLIC_EXPORT extern const char kDisplayTouchPortAssociations[];
-ASH_PUBLIC_EXPORT extern const char kExternalDisplayMirrorInfo[];
-ASH_PUBLIC_EXPORT extern const char kSecondaryDisplays[];
-ASH_PUBLIC_EXPORT extern const char kAllowMGSToStoreDisplayProperties[];
-
-ASH_PUBLIC_EXPORT extern const char kFullscreenAlertEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kGestureEducationNotificationShown[];
-
-ASH_PUBLIC_EXPORT extern const char kHasSeenStylus[];
-ASH_PUBLIC_EXPORT extern const char kShownPaletteWelcomeBubble[];
-ASH_PUBLIC_EXPORT extern const char kEnableStylusTools[];
-ASH_PUBLIC_EXPORT extern const char kLaunchPaletteOnEjectEvent[];
-ASH_PUBLIC_EXPORT extern const char
-    kLocalStateDevicePeripheralDataAccessEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kCanCellularSetupNotificationBeShown[];
-
-// Managed-guest session privacy warning.
-ASH_PUBLIC_EXPORT extern const char
-    kManagedGuestSessionPrivacyWarningsEnabled[];
-
-// Lock screen notification settings.
-ASH_PUBLIC_EXPORT extern const char kMessageCenterLockScreenMode[];
-ASH_PUBLIC_EXPORT extern const char kMessageCenterLockScreenModeShow[];
-ASH_PUBLIC_EXPORT extern const char kMessageCenterLockScreenModeHide[];
-ASH_PUBLIC_EXPORT extern const char kMessageCenterLockScreenModeHideSensitive[];
-
-ASH_PUBLIC_EXPORT extern const char kAmbientColorEnabled[];
-ASH_PUBLIC_EXPORT extern const char kColorModeThemed[];
-ASH_PUBLIC_EXPORT extern const char kDarkModeEnabled[];
-ASH_PUBLIC_EXPORT extern const char kNightLightEnabled[];
-ASH_PUBLIC_EXPORT extern const char kNightLightTemperature[];
-ASH_PUBLIC_EXPORT extern const char kNightLightScheduleType[];
-ASH_PUBLIC_EXPORT extern const char kNightLightCustomStartTime[];
-ASH_PUBLIC_EXPORT extern const char kNightLightCustomEndTime[];
-ASH_PUBLIC_EXPORT extern const char kNightLightCachedLatitude[];
-ASH_PUBLIC_EXPORT extern const char kNightLightCachedLongitude[];
-ASH_PUBLIC_EXPORT extern const char kAutoNightLightNotificationDismissed[];
-
-ASH_PUBLIC_EXPORT extern const char kOsSettingsEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kAllowScreenLock[];
-ASH_PUBLIC_EXPORT extern const char kEnableAutoScreenLock[];
-ASH_PUBLIC_EXPORT extern const char kPowerAcScreenBrightnessPercent[];
-ASH_PUBLIC_EXPORT extern const char kPowerAcScreenDimDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerAcScreenOffDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerAcScreenLockDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerAcIdleWarningDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerAcIdleDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerBatteryScreenBrightnessPercent[];
-ASH_PUBLIC_EXPORT extern const char kPowerBatteryScreenDimDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerBatteryScreenOffDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerBatteryScreenLockDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerBatteryIdleWarningDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerBatteryIdleDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerLockScreenDimDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerLockScreenOffDelayMs[];
-ASH_PUBLIC_EXPORT extern const char kPowerAcIdleAction[];
-ASH_PUBLIC_EXPORT extern const char kPowerBatteryIdleAction[];
-ASH_PUBLIC_EXPORT extern const char kPowerLidClosedAction[];
-ASH_PUBLIC_EXPORT extern const char kPowerUseAudioActivity[];
-ASH_PUBLIC_EXPORT extern const char kPowerUseVideoActivity[];
-ASH_PUBLIC_EXPORT extern const char kPowerAllowWakeLocks[];
-ASH_PUBLIC_EXPORT extern const char kPowerAllowScreenWakeLocks[];
-ASH_PUBLIC_EXPORT extern const char kPowerPresentationScreenDimDelayFactor[];
-ASH_PUBLIC_EXPORT extern const char kPowerUserActivityScreenDimDelayFactor[];
-ASH_PUBLIC_EXPORT extern const char kPowerWaitForInitialUserActivity[];
-ASH_PUBLIC_EXPORT extern const char
-    kPowerForceNonzeroBrightnessForUserActivity[];
-ASH_PUBLIC_EXPORT extern const char kPowerFastSuspendWhenBacklightsForcedOff[];
-ASH_PUBLIC_EXPORT extern const char kPowerSmartDimEnabled[];
-ASH_PUBLIC_EXPORT extern const char kPowerAlsLoggingEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kShelfAlignment[];
-ASH_PUBLIC_EXPORT extern const char kShelfAlignmentLocal[];
-ASH_PUBLIC_EXPORT extern const char kShelfAutoHideBehavior[];
-ASH_PUBLIC_EXPORT extern const char kShelfAutoHideBehaviorLocal[];
-ASH_PUBLIC_EXPORT extern const char kShelfPreferences[];
-
-ASH_PUBLIC_EXPORT extern const char kShowLogoutButtonInTray[];
-ASH_PUBLIC_EXPORT extern const char kLogoutDialogDurationMs[];
-ASH_PUBLIC_EXPORT extern const char kSuggestLogoutAfterClosingLastWindow[];
-
-ASH_PUBLIC_EXPORT extern const char kUserWallpaperInfo[];
-ASH_PUBLIC_EXPORT extern const char kWallpaperColors[];
-ASH_PUBLIC_EXPORT extern const char kSyncableWallpaperInfo[];
-ASH_PUBLIC_EXPORT extern const char kWallpaperCollectionId[];
-
-ASH_PUBLIC_EXPORT extern const char kUserBluetoothAdapterEnabled[];
-ASH_PUBLIC_EXPORT extern const char kSystemBluetoothAdapterEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kTapDraggingEnabled[];
-ASH_PUBLIC_EXPORT extern const char kTouchpadEnabled[];
-ASH_PUBLIC_EXPORT extern const char kTouchscreenEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kQuickUnlockPinSalt[];
-
-ASH_PUBLIC_EXPORT extern const char kDetachableBaseDevices[];
-
-ASH_PUBLIC_EXPORT extern const char kCursorMotionBlurEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kAssistantNumSessionsWhereOnboardingShown[];
-ASH_PUBLIC_EXPORT extern const char kAssistantTimeOfLastInteraction[];
-
-ASH_PUBLIC_EXPORT extern const char kVpnConfigAllowed[];
-
-ASH_PUBLIC_EXPORT extern const char kPowerPeakShiftEnabled[];
-ASH_PUBLIC_EXPORT extern const char kPowerPeakShiftBatteryThreshold[];
-ASH_PUBLIC_EXPORT extern const char kPowerPeakShiftDayConfig[];
-
-ASH_PUBLIC_EXPORT extern const char kBootOnAcEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kAdvancedBatteryChargeModeEnabled[];
-ASH_PUBLIC_EXPORT extern const char kAdvancedBatteryChargeModeDayConfig[];
-
-ASH_PUBLIC_EXPORT extern const char kBatteryChargeMode[];
-ASH_PUBLIC_EXPORT extern const char kBatteryChargeCustomStartCharging[];
-ASH_PUBLIC_EXPORT extern const char kBatteryChargeCustomStopCharging[];
-
-ASH_PUBLIC_EXPORT extern const char kUsbPowerShareEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kSuggestedContentInfoShownInLauncher[];
-ASH_PUBLIC_EXPORT extern const char kSuggestedContentInfoDismissedInLauncher[];
-
-ASH_PUBLIC_EXPORT extern const char kLockScreenMediaControlsEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kXkbAutoRepeatDelay[];
-ASH_PUBLIC_EXPORT extern const char kXkbAutoRepeatEnabled[];
-ASH_PUBLIC_EXPORT extern const char kXkbAutoRepeatInterval[];
-
-ASH_PUBLIC_EXPORT extern const char kNaturalScroll[];
-ASH_PUBLIC_EXPORT extern const char kMouseReverseScroll[];
-
-ASH_PUBLIC_EXPORT extern const char kMultipasteNudges[];
-
-ASH_PUBLIC_EXPORT extern const char kAppNotificationBadgingEnabled[];
-
-ASH_PUBLIC_EXPORT extern const char kGlobalMediaControlsPinned[];
-
-ASH_PUBLIC_EXPORT extern const char
-    kPciePeripheralDisplayNotificationRemaining[];
-
-ASH_PUBLIC_EXPORT extern const char kLastUsedImeShortcutReminderDismissed[];
-ASH_PUBLIC_EXPORT extern const char kNextImeShortcutReminderDismissed[];
-
-ASH_PUBLIC_EXPORT extern const char kImprovedShortcutsNotificationShownCount[];
-}  // namespace prefs
-
-}  // namespace ash
-
-#endif  // ASH_PUBLIC_CPP_ASH_PREF_NAMES_H_

diff --git a/ash/public/cpp/shelf_prefs.cc b/ash/public/cpp/shelf_prefs.cc
index 8cfe87d..c18c92d 100644
--- a/ash/public/cpp/shelf_prefs.cc
+++ b/ash/public/cpp/shelf_prefs.cc

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "components/prefs/pref_service.h"

diff --git a/ash/session/fullscreen_controller.cc b/ash/session/fullscreen_controller.cc
index f808e3a..6eb33718 100644
--- a/ash/session/fullscreen_controller.cc
+++ b/ash/session/fullscreen_controller.cc

@@ -7,7 +7,7 @@
 #include <limits>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/fullscreen_alert_bubble.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/shelf.h"

diff --git a/ash/shelf/assistant_overlay_unittest.cc b/ash/shelf/assistant_overlay_unittest.cc
index c8d7d6c..b060582 100644
--- a/ash/shelf/assistant_overlay_unittest.cc
+++ b/ash/shelf/assistant_overlay_unittest.cc

@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/assistant/assistant_state.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/shelf/contextual_tooltip.cc b/ash/shelf/contextual_tooltip.cc
index 874793c..5c9d9aa 100644
--- a/ash/shelf/contextual_tooltip.cc
+++ b/ash/shelf/contextual_tooltip.cc

@@ -5,8 +5,8 @@
 #include "ash/shelf/contextual_tooltip.h"
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/contextual_nudge_status_tracker.h"

diff --git a/ash/shelf/contextual_tooltip_unittest.cc b/ash/shelf/contextual_tooltip_unittest.cc
index 43a428e..eb6f819 100644
--- a/ash/shelf/contextual_tooltip_unittest.cc
+++ b/ash/shelf/contextual_tooltip_unittest.cc

@@ -5,7 +5,6 @@
 #include "ash/shelf/contextual_tooltip.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/contextual_nudge_status_tracker.h"
 #include "ash/shelf/contextual_tooltip.h"

diff --git a/ash/shelf/home_to_overview_nudge_controller_unittest.cc b/ash/shelf/home_to_overview_nudge_controller_unittest.cc
index 57c6a61c..3764b5c6 100644
--- a/ash/shelf/home_to_overview_nudge_controller_unittest.cc
+++ b/ash/shelf/home_to_overview_nudge_controller_unittest.cc

@@ -5,7 +5,7 @@
 #include "ash/shelf/home_to_overview_nudge_controller.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/contextual_nudge.h"
 #include "ash/shelf/contextual_tooltip.h"

diff --git a/ash/shelf/shelf_context_menu_model.cc b/ash/shelf/shelf_context_menu_model.cc
index 1e4bc36..277ce5f 100644
--- a/ash/shelf/shelf_context_menu_model.cc
+++ b/ash/shelf/shelf_context_menu_model.cc

@@ -10,8 +10,8 @@
 
 #include "ash/app_list/app_list_controller_impl.h"
 #include "ash/app_list/app_list_metrics.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/app_menu_constants.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shelf_prefs.h"

diff --git a/ash/shelf/shelf_controller.cc b/ash/shelf/shelf_controller.cc
index c1d20260..d238dda 100644
--- a/ash/shelf/shelf_controller.cc
+++ b/ash/shelf/shelf_controller.cc

@@ -4,7 +4,7 @@
 
 #include "ash/shelf/shelf_controller.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/message_center/arc_notification_constants.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/shelf_prefs.h"

diff --git a/ash/shelf/shelf_controller_unittest.cc b/ash/shelf/shelf_controller_unittest.cc
index cfe4249..d4525f3 100644
--- a/ash/shelf/shelf_controller_unittest.cc
+++ b/ash/shelf/shelf_controller_unittest.cc

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shelf_prefs.h"
 #include "ash/public/cpp/window_properties.h"

diff --git a/ash/shelf/shelf_drag_handle_unittest.cc b/ash/shelf/shelf_drag_handle_unittest.cc
index 850d3ea..49c9621 100644
--- a/ash/shelf/shelf_drag_handle_unittest.cc
+++ b/ash/shelf/shelf_drag_handle_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "ash/app_list/test/app_list_test_helper.h"
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/contextual_tooltip.h"

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index ac56193..9a22279 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc

@@ -14,9 +14,9 @@
 #include "ash/app_list/app_list_metrics.h"
 #include "ash/app_list/views/app_list_view.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/public/cpp/app_list/app_list_types.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/presentation_time_recorder.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/public/cpp/shelf_types.h"

diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index d4af9e8..aee6a1a 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc

@@ -21,7 +21,6 @@
 #include "ash/keyboard/ui/keyboard_ui.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/keyboard/ui/keyboard_util.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
 #include "ash/public/cpp/keyboard/keyboard_controller.h"
 #include "ash/public/cpp/keyboard/keyboard_controller_observer.h"

diff --git a/ash/shelf/test/shelf_layout_manager_test_base.cc b/ash/shelf/test/shelf_layout_manager_test_base.cc
index 158376e..19495cc 100644
--- a/ash/shelf/test/shelf_layout_manager_test_base.cc
+++ b/ash/shelf/test/shelf_layout_manager_test_base.cc

@@ -4,7 +4,7 @@
 
 #include "ash/shelf/test/shelf_layout_manager_test_base.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"

diff --git a/ash/style/ash_color_provider.cc b/ash/style/ash_color_provider.cc
index 74bf20d2..2c97750 100644
--- a/ash/style/ash_color_provider.cc
+++ b/ash/style/ash_color_provider.cc

@@ -8,7 +8,7 @@
 
 #include "ash/constants/ash_constants.h"
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/style/color_mode_observer.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/system/accessibility/tray_accessibility_unittest.cc b/ash/system/accessibility/tray_accessibility_unittest.cc
index 4bd8eba..86778c6 100644
--- a/ash/system/accessibility/tray_accessibility_unittest.cc
+++ b/ash/system/accessibility/tray_accessibility_unittest.cc

@@ -8,7 +8,6 @@
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/accessibility/accessibility_observer.h"
 #include "ash/accessibility/magnifier/docked_magnifier_controller.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/system/tray/detailed_view_delegate.h"

diff --git a/ash/system/audio/unified_volume_view.cc b/ash/system/audio/unified_volume_view.cc
index 37a3877..53895bb3 100644
--- a/ash/system/audio/unified_volume_view.cc
+++ b/ash/system/audio/unified_volume_view.cc

@@ -8,7 +8,7 @@
 #include <memory>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/system/bluetooth/bluetooth_power_controller.cc b/ash/system/bluetooth/bluetooth_power_controller.cc
index 0a14522..da6bd40 100644
--- a/ash/system/bluetooth/bluetooth_power_controller.cc
+++ b/ash/system/bluetooth/bluetooth_power_controller.cc

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "base/bind.h"

diff --git a/ash/system/bluetooth/bluetooth_power_controller_unittest.cc b/ash/system/bluetooth/bluetooth_power_controller_unittest.cc
index 2c182f0f..0d9b7e0 100644
--- a/ash/system/bluetooth/bluetooth_power_controller_unittest.cc
+++ b/ash/system/bluetooth/bluetooth_power_controller_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "ash/system/bluetooth/bluetooth_power_controller.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/system/gesture_education/gesture_education_notification_controller.cc b/ash/system/gesture_education/gesture_education_notification_controller.cc
index 39dc8b4..fcb0db9 100644
--- a/ash/system/gesture_education/gesture_education_notification_controller.cc
+++ b/ash/system/gesture_education/gesture_education_notification_controller.cc

@@ -5,7 +5,7 @@
 #include "ash/system/gesture_education/gesture_education_notification_controller.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/public/cpp/system_tray_client.h"

diff --git a/ash/system/media/media_tray.cc b/ash/system/media/media_tray.cc
index 37d3452..b07d272 100644
--- a/ash/system/media/media_tray.cc
+++ b/ash/system/media/media_tray.cc

@@ -4,8 +4,8 @@
 
 #include "ash/system/media/media_tray.h"
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/focus_cycler.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/media_notification_provider.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"

diff --git a/ash/system/message_center/ash_message_center_lock_screen_controller.cc b/ash/system/message_center/ash_message_center_lock_screen_controller.cc
index 483b10d..fbcae76 100644
--- a/ash/system/message_center/ash_message_center_lock_screen_controller.cc
+++ b/ash/system/message_center/ash_message_center_lock_screen_controller.cc

@@ -5,8 +5,8 @@
 #include "ash/system/message_center/ash_message_center_lock_screen_controller.h"
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/login/ui/lock_screen.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/toast_data.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/shelf.h"

diff --git a/ash/system/message_center/message_center_controller.cc b/ash/system/message_center/message_center_controller.cc
index cc4f1612..c8cf73c6 100644
--- a/ash/system/message_center/message_center_controller.cc
+++ b/ash/system/message_center/message_center_controller.cc

@@ -7,8 +7,8 @@
 #include <utility>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/message_center/arc_notification_manager_base.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/system/message_center/notifier_settings_view.cc b/ash/system/message_center/notifier_settings_view.cc
index 91d5f3a..b7a76f5 100644
--- a/ash/system/message_center/notifier_settings_view.cc
+++ b/ash/system/message_center/notifier_settings_view.cc

@@ -11,7 +11,7 @@
 #include <utility>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/notifier_metadata.h"
 #include "ash/public/cpp/notifier_settings_controller.h"
 #include "ash/resources/vector_icons/vector_icons.h"

diff --git a/ash/system/message_center/unified_message_center_view_unittest.cc b/ash/system/message_center/unified_message_center_view_unittest.cc
index 6ffe98c..11b57d6 100644
--- a/ash/system/message_center/unified_message_center_view_unittest.cc
+++ b/ash/system/message_center/unified_message_center_view_unittest.cc

@@ -5,7 +5,7 @@
 #include "ash/system/message_center/unified_message_center_view.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/system/message_center/ash_message_center_lock_screen_controller.h"

diff --git a/ash/system/network/cellular_setup_notifier.cc b/ash/system/network/cellular_setup_notifier.cc
index fb77e01c..000397e 100644
--- a/ash/system/network/cellular_setup_notifier.cc
+++ b/ash/system/network/cellular_setup_notifier.cc

@@ -4,7 +4,7 @@
 
 #include "ash/system/network/cellular_setup_notifier.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/network_config_service.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/public/cpp/system_tray_client.h"

diff --git a/ash/system/network/cellular_setup_notifier_unittest.cc b/ash/system/network/cellular_setup_notifier_unittest.cc
index ce21ceb9..15be5cf 100644
--- a/ash/system/network/cellular_setup_notifier_unittest.cc
+++ b/ash/system/network/cellular_setup_notifier_unittest.cc

@@ -5,7 +5,7 @@
 #include "ash/system/network/cellular_setup_notifier.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/system/system_notification_controller.h"

diff --git a/ash/system/network/vpn_list_view.cc b/ash/system/network/vpn_list_view.cc
index 6c8b823..89757362 100644
--- a/ash/system/network/vpn_list_view.cc
+++ b/ash/system/network/vpn_list_view.cc

@@ -7,8 +7,8 @@
 #include <memory>
 #include <vector>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/metrics/user_metrics_recorder.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/system_tray_client.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/system/night_light/night_light_controller_impl.cc b/ash/system/night_light/night_light_controller_impl.cc
index 4889c71..245dda9 100644
--- a/ash/system/night_light/night_light_controller_impl.cc
+++ b/ash/system/night_light/night_light_controller_impl.cc

@@ -8,9 +8,9 @@
 #include <memory>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/display/display_color_manager.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/public/cpp/system_tray_client.h"
 #include "ash/resources/vector_icons/vector_icons.h"

diff --git a/ash/system/night_light/night_light_controller_unittest.cc b/ash/system/night_light/night_light_controller_unittest.cc
index accab6d7..d02e41b8 100644
--- a/ash/system/night_light/night_light_controller_unittest.cc
+++ b/ash/system/night_light/night_light_controller_unittest.cc

@@ -8,9 +8,9 @@
 #include <string>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/session/session_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
index 6e2781c..9c9749e 100644
--- a/ash/system/palette/palette_tray.cc
+++ b/ash/system/palette/palette_tray.cc

@@ -8,7 +8,7 @@
 
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/public/cpp/stylus_utils.h"
 #include "ash/public/cpp/system_tray_client.h"

diff --git a/ash/system/palette/palette_tray_unittest.cc b/ash/system/palette/palette_tray_unittest.cc
index 45961666..fd16d32 100644
--- a/ash/system/palette/palette_tray_unittest.cc
+++ b/ash/system/palette/palette_tray_unittest.cc

@@ -11,10 +11,10 @@
 #include "ash/assistant/test/test_assistant_service.h"
 #include "ash/assistant/util/assistant_util.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/highlighter/highlighter_controller.h"
 #include "ash/highlighter/highlighter_controller_test_api.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/assistant/assistant_state.h"
 #include "ash/public/cpp/stylus_utils.h"
 #include "ash/root_window_controller.h"

diff --git a/ash/system/palette/palette_welcome_bubble.cc b/ash/system/palette/palette_welcome_bubble.cc
index c835d6e..d53e0bce 100644
--- a/ash/system/palette/palette_welcome_bubble.cc
+++ b/ash/system/palette/palette_welcome_bubble.cc

@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "ash/assistant/util/assistant_util.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/system/palette/palette_welcome_bubble_unittest.cc b/ash/system/palette/palette_welcome_bubble_unittest.cc
index 919c230..1bca2e01 100644
--- a/ash/system/palette/palette_welcome_bubble_unittest.cc
+++ b/ash/system/palette/palette_welcome_bubble_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "ash/system/palette/palette_welcome_bubble.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"
 #include "ash/shell.h"

diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc
index 4e2f48bb..9c34e05 100644
--- a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc
+++ b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/new_window_delegate.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/public/cpp/system_tray_client.h"

diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc
index 624d5e7..14114d0 100644
--- a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc
+++ b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc

@@ -7,7 +7,7 @@
 #include <memory>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/test/test_new_window_delegate.h"
 #include "ash/public/cpp/test/test_system_tray_client.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/system/power/power_prefs.cc b/ash/system/power/power_prefs.cc
index 2c9922a..80a6004 100644
--- a/ash/system/power/power_prefs.cc
+++ b/ash/system/power/power_prefs.cc

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "base/bind.h"

diff --git a/ash/system/power/power_prefs_unittest.cc b/ash/system/power/power_prefs_unittest.cc
index cd69539..9f5cd56 100644
--- a/ash/system/power/power_prefs_unittest.cc
+++ b/ash/system/power/power_prefs_unittest.cc

@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"

diff --git a/ash/system/session/logout_button_tray.cc b/ash/system/session/logout_button_tray.cc
index b48af04..4abf7f3 100644
--- a/ash/system/session/logout_button_tray.cc
+++ b/ash/system/session/logout_button_tray.cc

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/ash_typography.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/system/session/logout_button_tray_unittest.cc b/ash/system/session/logout_button_tray_unittest.cc
index 49a8bcc..330039a 100644
--- a/ash/system/session/logout_button_tray_unittest.cc
+++ b/ash/system/session/logout_button_tray_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "ash/system/session/logout_button_tray.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"

diff --git a/ash/system/session/logout_confirmation_controller.cc b/ash/system/session/logout_confirmation_controller.cc
index fc68ebe..c2c6389d 100644
--- a/ash/system/session/logout_confirmation_controller.cc
+++ b/ash/system/session/logout_confirmation_controller.cc

@@ -8,8 +8,8 @@
 #include <utility>
 #include <vector>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/login_status.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/system/session/logout_confirmation_controller_unittest.cc b/ash/system/session/logout_confirmation_controller_unittest.cc
index 743a46f..05c622a 100644
--- a/ash/system/session/logout_confirmation_controller_unittest.cc
+++ b/ash/system/session/logout_confirmation_controller_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "ash/system/session/logout_confirmation_controller.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"
 #include "ash/shell.h"

diff --git a/ash/system/unified/top_shortcuts_view.cc b/ash/system/unified/top_shortcuts_view.cc
index cbf70cc..6b462da 100644
--- a/ash/system/unified/top_shortcuts_view.cc
+++ b/ash/system/unified/top_shortcuts_view.cc

@@ -7,7 +7,7 @@
 #include <numeric>
 
 #include "ash/accessibility/accessibility_controller_impl.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/ash_view_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller_impl.h"

diff --git a/ash/system/unified/top_shortcuts_view_unittest.cc b/ash/system/unified/top_shortcuts_view_unittest.cc
index 1d81b889..b21bd0c 100644
--- a/ash/system/unified/top_shortcuts_view_unittest.cc
+++ b/ash/system/unified/top_shortcuts_view_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "ash/system/unified/top_shortcuts_view.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/test_session_controller_client.h"
 #include "ash/system/unified/collapse_button.h"
 #include "ash/system/unified/sign_out_button.h"

diff --git a/ash/touch/touch_devices_controller.cc b/ash/touch/touch_devices_controller.cc
index 9b4b6dc..e683d300 100644
--- a/ash/touch/touch_devices_controller.cc
+++ b/ash/touch/touch_devices_controller.cc

@@ -6,8 +6,8 @@
 
 #include <utility>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/touch/touch_devices_controller_unittest.cc b/ash/touch/touch_devices_controller_unittest.cc
index f38042d..eeb8e05 100644
--- a/ash/touch/touch_devices_controller_unittest.cc
+++ b/ash/touch/touch_devices_controller_unittest.cc

@@ -5,8 +5,8 @@
 #include "ash/touch/touch_devices_controller.h"
 
 #include "ash/accelerators/debug_commands.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/session/test_session_controller_client.h"

diff --git a/ash/wallpaper/wallpaper_controller_impl.cc b/ash/wallpaper/wallpaper_controller_impl.cc
index 5cebb2b..335e1662 100644
--- a/ash/wallpaper/wallpaper_controller_impl.cc
+++ b/ash/wallpaper/wallpaper_controller_impl.cc

@@ -10,10 +10,10 @@
 #include <utility>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/login/ui/login_constants.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/image_downloader.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/wallpaper/online_wallpaper_params.h"

diff --git a/ash/wallpaper/wallpaper_controller_unittest.cc b/ash/wallpaper/wallpaper_controller_unittest.cc
index d6f1e6f..8481c87 100644
--- a/ash/wallpaper/wallpaper_controller_unittest.cc
+++ b/ash/wallpaper/wallpaper_controller_unittest.cc

@@ -9,8 +9,8 @@
 #include <memory>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "ash/public/cpp/test/test_image_downloader.h"

diff --git a/ash/wm/desks/desks_restore_util.cc b/ash/wm/desks/desks_restore_util.cc
index ecd4468..f20b6c98 100644
--- a/ash/wm/desks/desks_restore_util.cc
+++ b/ash/wm/desks/desks_restore_util.cc

@@ -4,7 +4,7 @@
 
 #include "ash/wm/desks/desks_restore_util.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/wm/desks/desk.h"

diff --git a/ash/wm/desks/desks_unittests.cc b/ash/wm/desks/desks_unittests.cc
index d0827cda..c2c78e9 100644
--- a/ash/wm/desks/desks_unittests.cc
+++ b/ash/wm/desks/desks_unittests.cc

@@ -10,13 +10,13 @@
 #include "ash/app_list/app_list_presenter_impl.h"
 #include "ash/app_list/views/app_list_view.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/display/screen_orientation_controller_test_api.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/keyboard/ui/test/keyboard_test_util.h"
 #include "ash/multi_user/multi_user_window_manager_impl.h"
 #include "ash/public/cpp/app_list/app_list_types.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
 #include "ash/public/cpp/event_rewriter_controller.h"
 #include "ash/public/cpp/multi_user_window_manager.h"

diff --git a/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc b/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc
index 1b492fe..985227f 100644
--- a/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc
+++ b/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc

@@ -5,7 +5,7 @@
 #include "ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/contextual_tooltip.h"
 #include "ash/shell.h"

diff --git a/ash/wm/gestures/wm_gesture_handler.cc b/ash/wm/gestures/wm_gesture_handler.cc
index 21505e1..a6fecff 100644
--- a/ash/wm/gestures/wm_gesture_handler.cc
+++ b/ash/wm/gestures/wm_gesture_handler.cc

@@ -5,7 +5,7 @@
 #include "ash/wm/gestures/wm_gesture_handler.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/toast_data.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/wm/gestures/wm_gesture_handler_unittest.cc b/ash/wm/gestures/wm_gesture_handler_unittest.cc
index 1f09950..dbdc0ffb 100644
--- a/ash/wm/gestures/wm_gesture_handler_unittest.cc
+++ b/ash/wm/gestures/wm_gesture_handler_unittest.cc

@@ -5,7 +5,7 @@
 #include "ash/wm/gestures/wm_gesture_handler.h"
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"

diff --git a/ash/wm/window_cycle/window_cycle_controller.cc b/ash/wm/window_cycle/window_cycle_controller.cc
index 56654d6..73d5810 100644
--- a/ash/wm/window_cycle/window_cycle_controller.cc
+++ b/ash/wm/window_cycle/window_cycle_controller.cc

@@ -7,12 +7,12 @@
 #include "ash/accelerators/accelerator_controller_impl.h"
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/events/event_rewriter_controller_impl.h"
 #include "ash/metrics/task_switch_metrics_recorder.h"
 #include "ash/metrics/task_switch_source.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/public/cpp/accelerators.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"

diff --git a/ash/wm/window_cycle/window_cycle_controller_unittest.cc b/ash/wm/window_cycle/window_cycle_controller_unittest.cc
index be25b55d..af9dcce 100644
--- a/ash/wm/window_cycle/window_cycle_controller_unittest.cc
+++ b/ash/wm/window_cycle/window_cycle_controller_unittest.cc

@@ -13,11 +13,11 @@
 #include "ash/app_list/app_list_controller_impl.h"
 #include "ash/app_list/test/app_list_test_helper.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/focus_cycler.h"
 #include "ash/frame_throttler/frame_throttling_controller.h"
 #include "ash/frame_throttler/mock_frame_throttling_observer.h"
 #include "ash/multi_user/multi_user_window_manager_impl.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
 #include "ash/public/cpp/multi_user_window_manager.h"
 #include "ash/public/cpp/multi_user_window_manager_delegate.h"

diff --git a/ash/wm/window_cycle/window_cycle_event_filter.cc b/ash/wm/window_cycle/window_cycle_event_filter.cc
index cac3a03e..fb4b843 100644
--- a/ash/wm/window_cycle/window_cycle_event_filter.cc
+++ b/ash/wm/window_cycle/window_cycle_event_filter.cc

@@ -5,8 +5,8 @@
 #include "ash/wm/window_cycle/window_cycle_event_filter.h"
 
 #include "ash/accelerators/debug_commands.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/display/screen_ash.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/wm/window_cycle/window_cycle_controller.h"

diff --git a/ash/wm/window_cycle/window_cycle_tab_slider.cc b/ash/wm/window_cycle/window_cycle_tab_slider.cc
index 70925b6..c998dd8 100644
--- a/ash/wm/window_cycle/window_cycle_tab_slider.cc
+++ b/ash/wm/window_cycle/window_cycle_tab_slider.cc

@@ -4,7 +4,6 @@
 
 #include "ash/wm/window_cycle/window_cycle_tab_slider.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"

diff --git a/chrome/browser/ash/accessibility/accessibility_common_browsertest.cc b/chrome/browser/ash/accessibility/accessibility_common_browsertest.cc
index f1e3779..db571eb5 100644
--- a/chrome/browser/ash/accessibility/accessibility_common_browsertest.cc
+++ b/chrome/browser/ash/accessibility/accessibility_common_browsertest.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 "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "chrome/browser/ash/accessibility/accessibility_manager.h"
 #include "chrome/browser/ash/accessibility/accessibility_test_utils.h"
 #include "chrome/browser/extensions/component_loader.h"

diff --git a/chrome/browser/ash/accessibility/accessibility_manager.cc b/chrome/browser/ash/accessibility/accessibility_manager.cc
index 71954fa..799180a 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager.cc

@@ -14,13 +14,13 @@
 #include "ash/accessibility/sticky_keys/sticky_keys_controller.h"
 #include "ash/components/audio/sounds.h"
 #include "ash/constants/ash_constants.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/public/cpp/accelerators.h"
 #include "ash/public/cpp/accessibility_controller.h"
 #include "ash/public/cpp/accessibility_controller_enums.h"
 #include "ash/public/cpp/accessibility_focus_ring_controller.h"
 #include "ash/public/cpp/accessibility_focus_ring_info.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"

diff --git a/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc
index f4bf928..05895d5 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ash/accessibility/accessibility_manager.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/test/accessibility_controller_test_api.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"

diff --git a/chrome/browser/ash/accessibility/dictation.cc b/chrome/browser/ash/accessibility/dictation.cc
index fc22d7b..6d47a52 100644
--- a/chrome/browser/ash/accessibility/dictation.cc
+++ b/chrome/browser/ash/accessibility/dictation.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ash/accessibility/dictation.h"
 
 #include "ash/components/audio/sounds.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/containers/fixed_flat_map.h"
 #include "base/containers/flat_map.h"
 #include "base/metrics/histogram_functions.h"

diff --git a/chrome/browser/ash/accessibility/magnification_manager.cc b/chrome/browser/ash/accessibility/magnification_manager.cc
index aca1890e..f4f6332 100644
--- a/chrome/browser/ash/accessibility/magnification_manager.cc
+++ b/chrome/browser/ash/accessibility/magnification_manager.cc

@@ -9,7 +9,7 @@
 
 #include "ash/accessibility/magnifier/docked_magnifier_controller.h"
 #include "ash/accessibility/magnifier/fullscreen_magnifier_controller.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "chrome/browser/ash/accessibility/accessibility_manager.h"

diff --git a/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc b/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc
index feb5838..f79331c 100644
--- a/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc
+++ b/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc

@@ -5,8 +5,8 @@
 #include <string>
 
 #include "ash/accessibility/magnifier/fullscreen_magnifier_controller.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"

diff --git a/chrome/browser/ash/accessibility/switch_access_browsertest.cc b/chrome/browser/ash/accessibility/switch_access_browsertest.cc
index ff3320a4..9c883594 100644
--- a/chrome/browser/ash/accessibility/switch_access_browsertest.cc
+++ b/chrome/browser/ash/accessibility/switch_access_browsertest.cc

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/accessibility_controller.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/window_tree_host_lookup.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"

diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc
index 64618ba..e8293e6b 100644
--- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc
+++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc

@@ -15,7 +15,7 @@
 #include <string>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"

diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
index b3297ac2..abd71ca4 100644
--- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
+++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/keyboard/arc/arc_input_method_bounds_tracker.h"
 #include "ash/public/cpp/keyboard/keyboard_switches.h"
 #include "ash/public/cpp/tablet_mode.h"

diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service_unittest.cc b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service_unittest.cc
index 1870422b..d3cc816 100644
--- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service_unittest.cc
+++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service_unittest.cc

@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/keyboard/arc/arc_input_method_bounds_tracker.h"
 #include "ash/public/cpp/keyboard/keyboard_switches.h"
 #include "ash/public/cpp/tablet_mode.h"

diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.cc b/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.cc
index 00518ede..18c0eef2 100644
--- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.cc
+++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.cc

@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/keyboard/keyboard_switches.h"
 #include "ash/public/cpp/tablet_mode.h"
 #include "base/command_line.h"

diff --git a/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc b/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc
index 16a3e53e..f92cfcad 100644
--- a/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc
+++ b/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/gtest_prod_util.h"

diff --git a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc
index f16a407..0597819 100644
--- a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc
+++ b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc

@@ -9,7 +9,7 @@
 #include <string>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"

diff --git a/chrome/browser/ash/crosapi/prefs_ash.cc b/chrome/browser/ash/crosapi/prefs_ash.cc
index da08817..096e8d3b 100644
--- a/chrome/browser/ash/crosapi/prefs_ash.cc
+++ b/chrome/browser/ash/crosapi/prefs_ash.cc

@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/check.h"
 #include "chrome/browser/profiles/profile_manager.h"

diff --git a/chrome/browser/ash/crosapi/prefs_ash_unittest.cc b/chrome/browser/ash/crosapi/prefs_ash_unittest.cc
index d5418f1..cad4f23 100644
--- a/chrome/browser/ash/crosapi/prefs_ash_unittest.cc
+++ b/chrome/browser/ash/crosapi/prefs_ash_unittest.cc

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/callback_helpers.h"
 #include "base/test/bind.h"
 #include "chrome/test/base/scoped_testing_local_state.h"

diff --git a/chrome/browser/ash/display/display_prefs_browsertest.cc b/chrome/browser/ash/display/display_prefs_browsertest.cc
index 23a2aa2..ce3d490 100644
--- a/chrome/browser/ash/display/display_prefs_browsertest.cc
+++ b/chrome/browser/ash/display/display_prefs_browsertest.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 "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/shell.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"

diff --git a/chrome/browser/ash/login/existing_user_controller.cc b/chrome/browser/ash/login/existing_user_controller.cc
index 88f759d..0ae7297 100644
--- a/chrome/browser/ash/login/existing_user_controller.cc
+++ b/chrome/browser/ash/login/existing_user_controller.cc

@@ -8,8 +8,8 @@
 #include <utility>
 #include <vector>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/login_screen.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "base/barrier_closure.h"
@@ -288,7 +288,7 @@
   Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
   DCHECK(profile);
   PrefService* prefs = profile->GetPrefs();
-  prefs->SetString(prefs::kLoginExtensionApiLaunchExtensionId, extension_id);
+  prefs->SetString(::prefs::kLoginExtensionApiLaunchExtensionId, extension_id);
   prefs->CommitPendingWrite();
 }
 

diff --git a/chrome/browser/ash/login/lock_screen_utils.cc b/chrome/browser/ash/login/lock_screen_utils.cc
index 4bf6e87..c85fe4d 100644
--- a/chrome/browser/ash/login/lock_screen_utils.cc
+++ b/chrome/browser/ash/login/lock_screen_utils.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ash/login/lock_screen_utils.h"
 
 #include "ash/constants/ash_constants.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/containers/contains.h"
 #include "chrome/browser/ash/login/login_pref_names.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"

diff --git a/chrome/browser/ash/login/oobe_interactive_ui_test.cc b/chrome/browser/ash/login/oobe_interactive_ui_test.cc
index 7684c83..d9b8eda 100644
--- a/chrome/browser/ash/login/oobe_interactive_ui_test.cc
+++ b/chrome/browser/ash/login/oobe_interactive_ui_test.cc

@@ -5,8 +5,8 @@
 #include <memory>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/login_screen_test_api.h"
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "base/bind.h"

diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc
index bfc4e92..5d08165 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc
+++ b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"

diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.cc b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.cc
index f20c1e2..fca5162 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.cc
+++ b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "chrome/browser/ash/login/quick_unlock/pin_backend.h"
 #include "chrome/browser/ash/login/quick_unlock/quick_unlock_utils.h"
 #include "chrome/common/pref_names.h"
@@ -17,7 +17,7 @@
 // static
 void PinStoragePrefs::RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(ash::prefs::kQuickUnlockPinSalt, "");
-  registry->RegisterStringPref(prefs::kQuickUnlockPinSecret, "");
+  registry->RegisterStringPref(::prefs::kQuickUnlockPinSecret, "");
 }
 
 PinStoragePrefs::PinStoragePrefs(PrefService* pref_service)
@@ -43,12 +43,12 @@
       PinBackend::ComputeSecret(pin, salt, Key::KEY_TYPE_PASSWORD_PLAIN);
 
   pref_service_->SetString(ash::prefs::kQuickUnlockPinSalt, salt);
-  pref_service_->SetString(prefs::kQuickUnlockPinSecret, secret);
+  pref_service_->SetString(::prefs::kQuickUnlockPinSecret, secret);
 }
 
 void PinStoragePrefs::RemovePin() {
   pref_service_->SetString(ash::prefs::kQuickUnlockPinSalt, "");
-  pref_service_->SetString(prefs::kQuickUnlockPinSecret, "");
+  pref_service_->SetString(::prefs::kQuickUnlockPinSecret, "");
 }
 
 std::string PinStoragePrefs::PinSalt() const {
@@ -56,7 +56,7 @@
 }
 
 std::string PinStoragePrefs::PinSecret() const {
-  return pref_service_->GetString(prefs::kQuickUnlockPinSecret);
+  return pref_service_->GetString(::prefs::kQuickUnlockPinSecret);
 }
 
 bool PinStoragePrefs::IsPinAuthenticationAvailable() const {

diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs_unittest.cc b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs_unittest.cc
index 8975a5a..2d3f20e 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs_unittest.cc
+++ b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "chrome/browser/ash/login/quick_unlock/quick_unlock_factory.h"
 #include "chrome/browser/ash/login/quick_unlock/quick_unlock_storage.h"
 #include "chrome/browser/ash/login/quick_unlock/quick_unlock_utils.h"
@@ -73,7 +73,7 @@
   PrefService* prefs = profile_->GetPrefs();
 
   EXPECT_EQ("", prefs->GetString(ash::prefs::kQuickUnlockPinSalt));
-  EXPECT_EQ("", prefs->GetString(prefs::kQuickUnlockPinSecret));
+  EXPECT_EQ("", prefs->GetString(::prefs::kQuickUnlockPinSecret));
 
   PinStoragePrefsTestApi pin_storage_test(PinStoragePrefs());
 
@@ -82,14 +82,14 @@
   EXPECT_EQ(pin_storage_test.PinSalt(),
             prefs->GetString(ash::prefs::kQuickUnlockPinSalt));
   EXPECT_EQ(pin_storage_test.PinSecret(),
-            prefs->GetString(prefs::kQuickUnlockPinSecret));
+            prefs->GetString(::prefs::kQuickUnlockPinSecret));
   EXPECT_NE("", pin_storage_test.PinSalt());
   EXPECT_NE("", pin_storage_test.PinSecret());
 
   PinStoragePrefs()->RemovePin();
   EXPECT_FALSE(PinStoragePrefs()->IsPinSet());
   EXPECT_EQ("", prefs->GetString(ash::prefs::kQuickUnlockPinSalt));
-  EXPECT_EQ("", prefs->GetString(prefs::kQuickUnlockPinSecret));
+  EXPECT_EQ("", prefs->GetString(::prefs::kQuickUnlockPinSecret));
 }
 
 // Verifies that:

diff --git a/chrome/browser/ash/login/screens/gesture_navigation_screen.cc b/chrome/browser/ash/login/screens/gesture_navigation_screen.cc
index 564cabd6..4562f9a 100644
--- a/chrome/browser/ash/login/screens/gesture_navigation_screen.cc
+++ b/chrome/browser/ash/login/screens/gesture_navigation_screen.cc

@@ -5,8 +5,8 @@
 #include "chrome/browser/ash/login/screens/gesture_navigation_screen.h"
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/tablet_mode.h"
 #include "base/metrics/histogram_functions.h"
 #include "chrome/browser/ash/accessibility/accessibility_manager.h"

diff --git a/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc b/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc
index 4bdc02f..4d8d227 100644
--- a/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc

@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "base/bind.h"
 #include "base/run_loop.h"

diff --git a/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc b/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc
index 91dd2d1..c1c6198 100644
--- a/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc
+++ b/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc

@@ -9,7 +9,7 @@
 #include <unordered_set>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/login_screen.h"
 #include "base/bind.h"
 #include "base/command_line.h"

diff --git a/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc b/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc
index 048a95c..676b1d1 100644
--- a/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/shelf_test_api.h"
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "base/bind.h"

diff --git a/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc
index 75b6fd4..085d669 100644
--- a/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc
+++ b/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc

@@ -5,7 +5,7 @@
 #include <memory>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/login_screen_test_api.h"
 #include "base/run_loop.h"
 #include "base/test/metrics/histogram_tester.h"
@@ -224,11 +224,11 @@
   // One of the users has the primary-only policy.
   // List of unlock users doesn't depend on kEnableLockScreen preference.
   prefs1->SetBoolean(ash::prefs::kEnableAutoScreenLock, true);
-  prefs1->SetString(prefs::kMultiProfileUserBehavior,
+  prefs1->SetString(::prefs::kMultiProfileUserBehavior,
                     MultiProfileUserController::kBehaviorPrimaryOnly);
-  prefs2->SetString(prefs::kMultiProfileUserBehavior,
+  prefs2->SetString(::prefs::kMultiProfileUserBehavior,
                     MultiProfileUserController::kBehaviorUnrestricted);
-  prefs3->SetString(prefs::kMultiProfileUserBehavior,
+  prefs3->SetString(::prefs::kMultiProfileUserBehavior,
                     MultiProfileUserController::kBehaviorUnrestricted);
   user_manager::UserList unlock_users = user_manager->GetUnlockUsers();
   ASSERT_EQ(unlock_users.size(), 1u);
@@ -240,7 +240,7 @@
   EXPECT_EQ(users[0].account_id, unlock_users[0]->GetAccountId());
 
   // If all users have unrestricted policy then anyone can perform unlock.
-  prefs1->SetString(prefs::kMultiProfileUserBehavior,
+  prefs1->SetString(::prefs::kMultiProfileUserBehavior,
                     MultiProfileUserController::kBehaviorUnrestricted);
   unlock_users = user_manager->GetUnlockUsers();
   ASSERT_EQ(unlock_users.size(), 3u);
@@ -266,7 +266,7 @@
   // In this scenario this user is not allowed in multi-profile session but
   // if that user happened to still be part of multi-profile session it should
   // not be listed on screen lock.
-  prefs3->SetString(prefs::kMultiProfileUserBehavior,
+  prefs3->SetString(::prefs::kMultiProfileUserBehavior,
                     MultiProfileUserController::kBehaviorNotAllowed);
   unlock_users = user_manager->GetUnlockUsers();
   ASSERT_EQ(unlock_users.size(), 2u);

diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
index 0b3d2a6..0d167d7 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc

@@ -11,8 +11,8 @@
 #include <utility>
 #include <vector>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/session/session_controller.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"

diff --git a/chrome/browser/ash/login/users/user_manager_unittest.cc b/chrome/browser/ash/login/users/user_manager_unittest.cc
index dbae321..f2a2f07 100644
--- a/chrome/browser/ash/login/users/user_manager_unittest.cc
+++ b/chrome/browser/ash/login/users/user_manager_unittest.cc

@@ -6,8 +6,8 @@
 #include <cstring>
 #include <memory>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"

diff --git a/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos.cc b/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos.cc
index 947ab9dc..c4d2768e 100644
--- a/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos.cc
+++ b/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos.cc

@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/callback.h"
 #include "base/check.h"
 #include "base/json/json_reader.h"

diff --git a/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos_unittest.cc
index eb18823..2165a976 100644
--- a/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos_unittest.cc
+++ b/chrome/browser/ash/policy/handlers/configuration_policy_handler_chromeos_unittest.cc

@@ -7,7 +7,7 @@
 #include <memory>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"

diff --git a/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.cc b/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.cc
index fe3bb1d..23947e74 100644
--- a/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.cc
+++ b/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.cc

@@ -4,7 +4,7 @@
 
 #include "system_features_disable_list_policy_handler.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/containers/contains.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"

diff --git a/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler_unittest.cc b/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler_unittest.cc
index e86ad27..7c473a39 100644
--- a/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler_unittest.cc
+++ b/chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/values.h"
 #include "components/policy/core/common/policy_map.h"

diff --git a/chrome/browser/ash/power/auto_screen_brightness/adapter.cc b/chrome/browser/ash/power/auto_screen_brightness/adapter.cc
index 77ce29ca..d8d7af1 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/adapter.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/adapter.cc

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"

diff --git a/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc
index 8e05239..c6fa187c 100644
--- a/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc
+++ b/chrome/browser/ash/power/auto_screen_brightness/adapter_unittest.cc

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/task/thread_pool/thread_pool_instance.h"

diff --git a/chrome/browser/ash/power/idle_action_warning_observer.cc b/chrome/browser/ash/power/idle_action_warning_observer.cc
index 7239f56..da346ce 100644
--- a/chrome/browser/ash/power/idle_action_warning_observer.cc
+++ b/chrome/browser/ash/power/idle_action_warning_observer.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ash/power/idle_action_warning_observer.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "chrome/browser/ash/login/demo_mode/demo_session.h"

diff --git a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc
index 19852136..30765a3 100644
--- a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc
+++ b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc

@@ -7,8 +7,8 @@
 #include <cmath>
 #include <utility>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/devicetype.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/process/launch.h"
 #include "base/task/post_task.h"

diff --git a/chrome/browser/ash/power/ml/user_activity_manager.cc b/chrome/browser/ash/power/ml/user_activity_manager.cc
index c877663..c78458c 100644
--- a/chrome/browser/ash/power/ml/user_activity_manager.cc
+++ b/chrome/browser/ash/power/ml/user_activity_manager.cc

@@ -8,8 +8,8 @@
 
 #include "ash/constants/app_types.h"
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/devicetype.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "base/bind.h"

diff --git a/chrome/browser/ash/system/tray_accessibility_browsertest.cc b/chrome/browser/ash/system/tray_accessibility_browsertest.cc
index 4e36537..9b36a9c 100644
--- a/chrome/browser/ash/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/ash/system/tray_accessibility_browsertest.cc

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/ash_view_ids.h"
 #include "ash/public/cpp/system_tray_test_api.h"
 #include "base/callback.h"

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 8789395..e1d5350 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -416,8 +416,8 @@
 #include "sandbox/policy/mac/params.h"
 #include "sandbox/policy/mac/sandbox_mac.h"
 #elif BUILDFLAG(IS_CHROMEOS_ASH)
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/tablet_mode.h"
 #include "ash/webui/scanning/url_constants.h"
 #include "chrome/app/chrome_crash_reporter_client.h"

diff --git a/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.cc b/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.cc
index bd192b5f..1c833d6 100644
--- a/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.cc
+++ b/chrome/browser/chromeos/cryptauth/client_app_metadata_provider_service.cc

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/linux_util.h"
@@ -125,8 +125,9 @@
 // static
 void ClientAppMetadataProviderService::RegisterProfilePrefs(
     PrefRegistrySimple* registry) {
-  registry->RegisterStringPref(prefs::kCryptAuthInstanceId, std::string());
-  registry->RegisterStringPref(prefs::kCryptAuthInstanceIdToken, std::string());
+  registry->RegisterStringPref(::prefs::kCryptAuthInstanceId, std::string());
+  registry->RegisterStringPref(::prefs::kCryptAuthInstanceIdToken,
+                               std::string());
 }
 
 // static
@@ -245,12 +246,12 @@
     const std::string& instance_id) {
   DCHECK(!instance_id.empty());
   std::string previous_instance_id =
-      pref_service_->GetString(prefs::kCryptAuthInstanceId);
+      pref_service_->GetString(::prefs::kCryptAuthInstanceId);
   if (!previous_instance_id.empty()) {
     base::UmaHistogramBoolean("CryptAuth.InstanceId.DidInstanceIdChange",
                               previous_instance_id != instance_id);
   }
-  pref_service_->SetString(prefs::kCryptAuthInstanceId, instance_id);
+  pref_service_->SetString(::prefs::kCryptAuthInstanceId, instance_id);
 
   GetInstanceId()->GetToken(
       device_sync::
@@ -300,12 +301,12 @@
 
   DCHECK(!token.empty());
   std::string previous_instance_id_token =
-      pref_service_->GetString(prefs::kCryptAuthInstanceIdToken);
+      pref_service_->GetString(::prefs::kCryptAuthInstanceIdToken);
   if (!previous_instance_id_token.empty()) {
     base::UmaHistogramBoolean("CryptAuth.InstanceId.DidInstanceIdTokenChange",
                               previous_instance_id_token != token);
   }
-  pref_service_->SetString(prefs::kCryptAuthInstanceIdToken, token);
+  pref_service_->SetString(::prefs::kCryptAuthInstanceIdToken, token);
 
   cryptauthv2::ClientAppMetadata metadata;
 

diff --git a/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc b/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc
index a62b65a..57c0419 100644
--- a/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc
+++ b/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_apitest.h"

diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
index c59f032..2e989d9 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc

@@ -13,11 +13,11 @@
 #include <utility>
 
 #include "ash/constants/app_types.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/accelerators.h"
 #include "ash/public/cpp/accessibility_controller.h"
 #include "ash/public/cpp/ambient/ambient_ui_model.h"
 #include "ash/public/cpp/app_list/app_list_types.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/autotest_ambient_api.h"
 #include "ash/public/cpp/autotest_desks_api.h"
 #include "ash/public/cpp/autotest_private_api_utils.h"

diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
index d0e4be3..f6fc287 100644
--- a/chrome/browser/chromeos/extensions/info_private_api.cc
+++ b/chrome/browser/chromeos/extensions/info_private_api.cc

@@ -9,8 +9,8 @@
 #include <memory>
 #include <utility>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/devicetype.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/stylus_utils.h"
 #include "ash/public/cpp/tablet_mode.h"
 #include "base/memory/ptr_util.h"

diff --git a/chrome/browser/chromeos/extensions/info_private_apitest.cc b/chrome/browser/chromeos/extensions/info_private_apitest.cc
index d5d3fe7..d98008c7 100644
--- a/chrome/browser/chromeos/extensions/info_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/info_private_apitest.cc

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/stylus_utils.h"
 #include "base/test/scoped_chromeos_version_info.h"
 #include "base/values.h"

diff --git a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc
index 4ebd3db..43f3a13 100644
--- a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc
+++ b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc

@@ -8,7 +8,7 @@
 #include <string>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/containers/contains.h"
 #include "chrome/browser/ash/login/quick_unlock/auth_token.h"

diff --git a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
index 4dea2a3..c11d8db6 100644
--- a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc

@@ -9,7 +9,7 @@
 #include <memory>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/containers/contains.h"
@@ -501,12 +501,12 @@
   bool HasUserValueForPinAutosubmitPref() {
     const bool has_user_val =
         test_pref_service_->GetUserPrefValue(
-            prefs::kPinUnlockAutosubmitEnabled) != nullptr;
+            ::prefs::kPinUnlockAutosubmitEnabled) != nullptr;
     return has_user_val;
   }
 
   bool GetAutosubmitPrefVal() {
-    return test_pref_service_->GetBoolean(prefs::kPinUnlockAutosubmitEnabled);
+    return test_pref_service_->GetBoolean(::prefs::kPinUnlockAutosubmitEnabled);
   }
 
   int GetExposedPinLength() {
@@ -829,39 +829,39 @@
 
   // Verify that now if the minimum length is set to 3, PINs of length 3 are
   // accepted.
-  pref_service->SetInteger(prefs::kPinUnlockMinimumLength, 3);
+  pref_service->SetInteger(::prefs::kPinUnlockMinimumLength, 3);
   CheckPin(PIN_WEAK_WARNING, "111");
 
   // Verify setting a nonzero maximum length that is less than the minimum
   // length results in the pin only accepting PINs of length minimum length.
-  pref_service->SetInteger(prefs::kPinUnlockMaximumLength, 2);
-  pref_service->SetInteger(prefs::kPinUnlockMinimumLength, 4);
+  pref_service->SetInteger(::prefs::kPinUnlockMaximumLength, 2);
+  pref_service->SetInteger(::prefs::kPinUnlockMinimumLength, 4);
   CheckPin(PIN_GOOD, "1112");
   CheckPin(PIN_TOO_SHORT, "112");
   CheckPin(PIN_TOO_LONG, "11112");
 
   // Verify that now if the maximum length is set to 5, PINs longer than 5 are
   // considered too long and cannot be used.
-  pref_service->SetInteger(prefs::kPinUnlockMaximumLength, 5);
+  pref_service->SetInteger(::prefs::kPinUnlockMaximumLength, 5);
   CheckPin(PIN_TOO_LONG | PIN_WEAK_WARNING, "111111");
   CheckPin(PIN_TOO_LONG | PIN_WEAK_WARNING, "1111111");
 
   // Verify that if both the minimum length and maximum length is set to 4, only
   // 4 digit PINs can be used.
-  pref_service->SetInteger(prefs::kPinUnlockMinimumLength, 4);
-  pref_service->SetInteger(prefs::kPinUnlockMaximumLength, 4);
+  pref_service->SetInteger(::prefs::kPinUnlockMinimumLength, 4);
+  pref_service->SetInteger(::prefs::kPinUnlockMaximumLength, 4);
   CheckPin(PIN_TOO_SHORT, "122");
   CheckPin(PIN_TOO_LONG, "12222");
   CheckPin(PIN_GOOD, "1222");
 
   // Set the PINs minimum/maximum lengths back to their defaults.
-  pref_service->SetInteger(prefs::kPinUnlockMinimumLength, 4);
-  pref_service->SetInteger(prefs::kPinUnlockMaximumLength, 0);
+  pref_service->SetInteger(::prefs::kPinUnlockMinimumLength, 4);
+  pref_service->SetInteger(::prefs::kPinUnlockMaximumLength, 0);
 
   // Verify that PINs that are weak are flagged as such. See
   // IsPinDifficultEnough in quick_unlock_private_api.cc for the description of
   // a weak pin.
-  pref_service->SetBoolean(prefs::kPinUnlockWeakPinsAllowed, false);
+  pref_service->SetBoolean(::prefs::kPinUnlockWeakPinsAllowed, false);
   // Good.
   CheckPin(PIN_GOOD, "1112");
   CheckPin(PIN_GOOD, "7890");
@@ -887,19 +887,19 @@
 
   // Verify that trying out PINs under the minimum/maximum lengths will send the
   // minimum/maximum lengths as additional information for display purposes.
-  pref_service->SetInteger(prefs::kPinUnlockMinimumLength, 6);
-  pref_service->SetInteger(prefs::kPinUnlockMaximumLength, 8);
+  pref_service->SetInteger(::prefs::kPinUnlockMinimumLength, 6);
+  pref_service->SetInteger(::prefs::kPinUnlockMaximumLength, 8);
   CheckGetCredentialRequirements(6, 8);
 
   // Verify that by setting a maximum length to be nonzero and smaller than the
   // minimum length, the resulting maxium length will be equal to the minimum
   // length pref.
-  pref_service->SetInteger(prefs::kPinUnlockMaximumLength, 4);
+  pref_service->SetInteger(::prefs::kPinUnlockMaximumLength, 4);
   CheckGetCredentialRequirements(6, 6);
 
   // Verify that the values received from policy are sanitized.
-  pref_service->SetInteger(prefs::kPinUnlockMinimumLength, -3);
-  pref_service->SetInteger(prefs::kPinUnlockMaximumLength, -3);
+  pref_service->SetInteger(::prefs::kPinUnlockMinimumLength, -3);
+  pref_service->SetInteger(::prefs::kPinUnlockMaximumLength, -3);
   CheckGetCredentialRequirements(1, 0);
 }
 
@@ -916,7 +916,7 @@
 // When recommended to be disabled, PIN auto submit will not be enabled when
 // setting a PIN.
 TEST_P(QuickUnlockPrivateUnitTest, PinAutosubmitRecommendedDisabled) {
-  test_pref_service_->SetRecommendedPref(prefs::kPinUnlockAutosubmitEnabled,
+  test_pref_service_->SetRecommendedPref(::prefs::kPinUnlockAutosubmitEnabled,
                                          std::make_unique<base::Value>(false));
 
   SetPin("123456");
@@ -928,7 +928,7 @@
 // When forced to be disabled, PIN auto submit will not be enabled when
 // setting a PIN.
 TEST_P(QuickUnlockPrivateUnitTest, PinAutosubmitForcedDisabled) {
-  test_pref_service_->SetManagedPref(prefs::kPinUnlockAutosubmitEnabled,
+  test_pref_service_->SetManagedPref(::prefs::kPinUnlockAutosubmitEnabled,
                                      std::make_unique<base::Value>(false));
 
   SetPin("123456");
@@ -1013,7 +1013,7 @@
   const bool feature_enabled = IsAutosubmitFeatureEnabled();
 
   // Start with MANDATORY FALSE to prevent auto enabling when setting a PIN.
-  test_pref_service_->SetManagedPref(prefs::kPinUnlockAutosubmitEnabled,
+  test_pref_service_->SetManagedPref(::prefs::kPinUnlockAutosubmitEnabled,
                                      std::make_unique<base::Value>(false));
   SetPin("123456");
   EXPECT_TRUE(IsPinSetInBackend());
@@ -1021,7 +1021,7 @@
   EXPECT_EQ(GetExposedPinLength(), 0);
 
   // Autosubmit disabled, length unknown. Change to MANDATORY TRUE
-  test_pref_service_->SetManagedPref(prefs::kPinUnlockAutosubmitEnabled,
+  test_pref_service_->SetManagedPref(::prefs::kPinUnlockAutosubmitEnabled,
                                      std::make_unique<base::Value>(true));
   EXPECT_TRUE(GetAutosubmitPrefVal());
   EXPECT_EQ(GetExposedPinLength(), 0);
@@ -1046,7 +1046,7 @@
   EXPECT_EQ(GetExposedPinLength(), feature_enabled ? 6 : 0);
 
   // Switch to MANDATORY FALSE.
-  test_pref_service_->SetManagedPref(prefs::kPinUnlockAutosubmitEnabled,
+  test_pref_service_->SetManagedPref(::prefs::kPinUnlockAutosubmitEnabled,
                                      std::make_unique<base::Value>(false));
 
   // Called during user pod update.
@@ -1118,7 +1118,7 @@
     return;
 
   // Enterprise users have auto submit disabled by default.
-  test_pref_service_->SetManagedPref(prefs::kPinUnlockAutosubmitEnabled,
+  test_pref_service_->SetManagedPref(::prefs::kPinUnlockAutosubmitEnabled,
                                      std::make_unique<base::Value>(false));
 
   SetPinForBackfillTests("123456");

diff --git a/chrome/browser/chromeos/input_method/assistive_window_controller_unittest.cc b/chrome/browser/chromeos/input_method/assistive_window_controller_unittest.cc
index 98f2c9e..f70e650 100644
--- a/chrome/browser/chromeos/input_method/assistive_window_controller_unittest.cc
+++ b/chrome/browser/chromeos/input_method/assistive_window_controller_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/input_method/assistive_window_controller.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/test/task_environment.h"
 #include "chrome/browser/chromeos/input_method/assistive_window_controller_delegate.h"
 #include "chrome/browser/chromeos/input_method/ui/suggestion_details.h"

diff --git a/chrome/browser/chromeos/input_method/personal_info_suggester_unittest.cc b/chrome/browser/chromeos/input_method/personal_info_suggester_unittest.cc
index 4561305..a604409a 100644
--- a/chrome/browser/chromeos/input_method/personal_info_suggester_unittest.cc
+++ b/chrome/browser/chromeos/input_method/personal_info_suggester_unittest.cc

@@ -6,7 +6,6 @@
 
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_pref_names.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/metrics/histogram_tester.h"

diff --git a/chrome/browser/chromeos/input_method/tts_handler.cc b/chrome/browser/chromeos/input_method/tts_handler.cc
index 698493b2..1081dbd 100644
--- a/chrome/browser/chromeos/input_method/tts_handler.cc
+++ b/chrome/browser/chromeos/input_method/tts_handler.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/input_method/tts_handler.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/prefs/pref_service.h"
 

diff --git a/chrome/browser/chromeos/policy/login/device_login_screen_policy_browsertest.cc b/chrome/browser/chromeos/policy/login/device_login_screen_policy_browsertest.cc
index baa4e809..bea567a 100644
--- a/chrome/browser/chromeos/policy/login/device_login_screen_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/login/device_login_screen_policy_browsertest.cc

@@ -4,8 +4,8 @@
 
 #include <string>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/login_screen_test_api.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"

diff --git a/chrome/browser/chromeos/policy/login/login_screen_accessibility_policy_browsertest.cc b/chrome/browser/chromeos/policy/login/login_screen_accessibility_policy_browsertest.cc
index 1e230006..80979e8 100644
--- a/chrome/browser/chromeos/policy/login/login_screen_accessibility_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/login/login_screen_accessibility_policy_browsertest.cc

@@ -4,9 +4,9 @@
 
 #include <string>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/public/cpp/accessibility_controller.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"

diff --git a/chrome/browser/chromeos/policy/login/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login/login_screen_default_policy_browsertest.cc
index e728718e..30130b9 100644
--- a/chrome/browser/chromeos/policy/login/login_screen_default_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/login/login_screen_default_policy_browsertest.cc

@@ -4,8 +4,8 @@
 
 #include <string>
 
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index c7e3170..506c6d7 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc

@@ -13,7 +13,6 @@
 #include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/public/ash_interfaces.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
 #include "ash/public/mojom/cros_display_config.mojom.h"
 #include "base/bind.h"

diff --git a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
index d824afb..2c7d036 100644
--- a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc

@@ -6,7 +6,7 @@
 #include <sys/types.h>
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/command_line.h"
 #include "base/test/scoped_feature_list.h"
 #include "chrome/browser/ash/login/login_manager_test.h"
@@ -58,66 +58,66 @@
   void SetPrefs(PrefService* prefs, bool variant) {
     prefs->SetBoolean(ash::prefs::kMouseReverseScroll, variant);
     prefs->SetBoolean(ash::prefs::kNaturalScroll, variant);
-    prefs->SetBoolean(prefs::kTapToClickEnabled, variant);
-    prefs->SetBoolean(prefs::kPrimaryMouseButtonRight, !variant);
-    prefs->SetBoolean(prefs::kPrimaryPointingStickButtonRight, !variant);
-    prefs->SetBoolean(prefs::kMouseAcceleration, variant);
-    prefs->SetBoolean(prefs::kMouseScrollAcceleration, variant);
-    prefs->SetBoolean(prefs::kPointingStickAcceleration, variant);
-    prefs->SetBoolean(prefs::kTouchpadAcceleration, variant);
-    prefs->SetBoolean(prefs::kTouchpadScrollAcceleration, variant);
-    prefs->SetBoolean(prefs::kEnableTouchpadThreeFingerClick, !variant);
-    prefs->SetInteger(prefs::kMouseSensitivity, !variant);
-    prefs->SetInteger(prefs::kMouseScrollSensitivity, variant ? 1 : 4);
-    prefs->SetInteger(prefs::kPointingStickSensitivity, !variant);
-    prefs->SetInteger(prefs::kTouchpadSensitivity, variant);
-    prefs->SetInteger(prefs::kTouchpadScrollSensitivity, variant ? 1 : 4);
+    prefs->SetBoolean(::prefs::kTapToClickEnabled, variant);
+    prefs->SetBoolean(::prefs::kPrimaryMouseButtonRight, !variant);
+    prefs->SetBoolean(::prefs::kPrimaryPointingStickButtonRight, !variant);
+    prefs->SetBoolean(::prefs::kMouseAcceleration, variant);
+    prefs->SetBoolean(::prefs::kMouseScrollAcceleration, variant);
+    prefs->SetBoolean(::prefs::kPointingStickAcceleration, variant);
+    prefs->SetBoolean(::prefs::kTouchpadAcceleration, variant);
+    prefs->SetBoolean(::prefs::kTouchpadScrollAcceleration, variant);
+    prefs->SetBoolean(::prefs::kEnableTouchpadThreeFingerClick, !variant);
+    prefs->SetInteger(::prefs::kMouseSensitivity, !variant);
+    prefs->SetInteger(::prefs::kMouseScrollSensitivity, variant ? 1 : 4);
+    prefs->SetInteger(::prefs::kPointingStickSensitivity, !variant);
+    prefs->SetInteger(::prefs::kTouchpadSensitivity, variant);
+    prefs->SetInteger(::prefs::kTouchpadScrollSensitivity, variant ? 1 : 4);
     prefs->SetBoolean(ash::prefs::kXkbAutoRepeatEnabled, variant);
     prefs->SetInteger(ash::prefs::kXkbAutoRepeatDelay, variant ? 100 : 500);
     prefs->SetInteger(ash::prefs::kXkbAutoRepeatInterval, variant ? 1 : 4);
-    prefs->SetString(prefs::kLanguagePreloadEngines,
-                     variant ? "xkb:us::eng,xkb:us:dvorak:eng"
-                             : "xkb:us::eng,xkb:ru::rus");
+    prefs->SetString(
+        ::prefs::kLanguagePreloadEngines,
+        variant ? "xkb:us::eng,xkb:us:dvorak:eng" : "xkb:us::eng,xkb:ru::rus");
   }
 
   void CheckSettingsCorrespondToPrefs(PrefService* prefs) {
-    EXPECT_EQ(prefs->GetBoolean(prefs::kTapToClickEnabled),
+    EXPECT_EQ(prefs->GetBoolean(::prefs::kTapToClickEnabled),
               input_settings_->current_touchpad_settings().GetTapToClick());
-    EXPECT_EQ(prefs->GetBoolean(prefs::kPrimaryMouseButtonRight),
-              input_settings_->current_mouse_settings()
-                  .GetPrimaryButtonRight());
-    EXPECT_EQ(prefs->GetBoolean(prefs::kPrimaryPointingStickButtonRight),
+    EXPECT_EQ(
+        prefs->GetBoolean(::prefs::kPrimaryMouseButtonRight),
+        input_settings_->current_mouse_settings().GetPrimaryButtonRight());
+    EXPECT_EQ(prefs->GetBoolean(::prefs::kPrimaryPointingStickButtonRight),
               input_settings_->current_pointing_stick_settings()
                   .GetPrimaryButtonRight());
     EXPECT_EQ(prefs->GetBoolean(ash::prefs::kMouseReverseScroll),
               input_settings_->current_mouse_settings().GetReverseScroll());
-    EXPECT_EQ(prefs->GetBoolean(prefs::kMouseAcceleration),
+    EXPECT_EQ(prefs->GetBoolean(::prefs::kMouseAcceleration),
               input_settings_->current_mouse_settings().GetAcceleration());
     EXPECT_EQ(
-        prefs->GetBoolean(prefs::kMouseScrollAcceleration),
+        prefs->GetBoolean(::prefs::kMouseScrollAcceleration),
         input_settings_->current_mouse_settings().GetScrollAcceleration());
     EXPECT_EQ(
-        prefs->GetBoolean(prefs::kPointingStickAcceleration),
+        prefs->GetBoolean(::prefs::kPointingStickAcceleration),
         input_settings_->current_pointing_stick_settings().GetAcceleration());
-    EXPECT_EQ(prefs->GetBoolean(prefs::kTouchpadAcceleration),
+    EXPECT_EQ(prefs->GetBoolean(::prefs::kTouchpadAcceleration),
               input_settings_->current_touchpad_settings().GetAcceleration());
     EXPECT_EQ(
-        prefs->GetBoolean(prefs::kTouchpadScrollAcceleration),
+        prefs->GetBoolean(::prefs::kTouchpadScrollAcceleration),
         input_settings_->current_touchpad_settings().GetScrollAcceleration());
-    EXPECT_EQ(prefs->GetBoolean(prefs::kEnableTouchpadThreeFingerClick),
-              input_settings_->current_touchpad_settings()
-                  .GetThreeFingerClick());
-    EXPECT_EQ(prefs->GetInteger(prefs::kMouseSensitivity),
+    EXPECT_EQ(
+        prefs->GetBoolean(::prefs::kEnableTouchpadThreeFingerClick),
+        input_settings_->current_touchpad_settings().GetThreeFingerClick());
+    EXPECT_EQ(prefs->GetInteger(::prefs::kMouseSensitivity),
               input_settings_->current_mouse_settings().GetSensitivity());
-    EXPECT_EQ(prefs->GetInteger(prefs::kMouseScrollSensitivity),
+    EXPECT_EQ(prefs->GetInteger(::prefs::kMouseScrollSensitivity),
               input_settings_->current_mouse_settings().GetScrollSensitivity());
     EXPECT_EQ(
-        prefs->GetInteger(prefs::kPointingStickSensitivity),
+        prefs->GetInteger(::prefs::kPointingStickSensitivity),
         input_settings_->current_pointing_stick_settings().GetSensitivity());
-    EXPECT_EQ(prefs->GetInteger(prefs::kTouchpadSensitivity),
+    EXPECT_EQ(prefs->GetInteger(::prefs::kTouchpadSensitivity),
               input_settings_->current_touchpad_settings().GetSensitivity());
     EXPECT_EQ(
-        prefs->GetInteger(prefs::kTouchpadScrollSensitivity),
+        prefs->GetInteger(::prefs::kTouchpadScrollSensitivity),
         input_settings_->current_touchpad_settings().GetScrollSensitivity());
     EXPECT_EQ(prefs->GetBoolean(ash::prefs::kXkbAutoRepeatEnabled),
               keyboard_->auto_repeat_is_enabled_);
@@ -126,7 +126,7 @@
               (int)rate.initial_delay_in_ms);
     EXPECT_EQ(prefs->GetInteger(ash::prefs::kXkbAutoRepeatInterval),
               (int)rate.repeat_interval_in_ms);
-    EXPECT_EQ(prefs->GetString(prefs::kLanguageCurrentInputMethod),
+    EXPECT_EQ(prefs->GetString(::prefs::kLanguageCurrentInputMethod),
               input_method::InputMethodManager::Get()
                   ->GetActiveIMEState()
                   ->GetCurrentInputMethod()
@@ -135,13 +135,13 @@
 
   void CheckLocalStateCorrespondsToPrefs(PrefService* prefs) {
     PrefService* local_state = g_browser_process->local_state();
-    EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerTapToClickEnabled),
-              prefs->GetBoolean(prefs::kTapToClickEnabled));
-    EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight),
-              prefs->GetBoolean(prefs::kPrimaryMouseButtonRight));
+    EXPECT_EQ(local_state->GetBoolean(::prefs::kOwnerTapToClickEnabled),
+              prefs->GetBoolean(::prefs::kTapToClickEnabled));
+    EXPECT_EQ(local_state->GetBoolean(::prefs::kOwnerPrimaryMouseButtonRight),
+              prefs->GetBoolean(::prefs::kPrimaryMouseButtonRight));
     EXPECT_EQ(
-        local_state->GetBoolean(prefs::kOwnerPrimaryPointingStickButtonRight),
-        prefs->GetBoolean(prefs::kPrimaryPointingStickButtonRight));
+        local_state->GetBoolean(::prefs::kOwnerPrimaryPointingStickButtonRight),
+        prefs->GetBoolean(::prefs::kPrimaryPointingStickButtonRight));
   }
 
   LoginManagerMixin login_mixin_{&mixin_host_};
@@ -213,11 +213,11 @@
   // state prefs and vice versa.
   EXPECT_EQ(user_manager->GetOwnerAccountId(), users[0].account_id);
   CheckLocalStateCorrespondsToPrefs(prefs1);
-  prefs2->SetBoolean(prefs::kTapToClickEnabled,
-                     !prefs1->GetBoolean(prefs::kTapToClickEnabled));
+  prefs2->SetBoolean(::prefs::kTapToClickEnabled,
+                     !prefs1->GetBoolean(::prefs::kTapToClickEnabled));
   CheckLocalStateCorrespondsToPrefs(prefs1);
-  prefs1->SetBoolean(prefs::kTapToClickEnabled,
-                     !prefs1->GetBoolean(prefs::kTapToClickEnabled));
+  prefs1->SetBoolean(::prefs::kTapToClickEnabled,
+                     !prefs1->GetBoolean(::prefs::kTapToClickEnabled));
   CheckLocalStateCorrespondsToPrefs(prefs1);
 
   // Switch user back.

diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index a5d6288..bdf0f43 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc

@@ -52,7 +52,7 @@
 #include "media/media_buildflags.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/public/cpp/ash_pref_names.h"  // nogncheck
+#include "ash/constants/ash_pref_names.h"  // nogncheck
 #endif
 
 using extensions::mojom::APIPermissionID;

diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index caaa722..eb36307 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc

@@ -59,8 +59,8 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ash/constants/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"  // nogncheck
 #include "ash/public/cpp/ambient/ambient_prefs.h"
-#include "ash/public/cpp/ash_pref_names.h"  // nogncheck
 #include "chrome/browser/ash/crostini/crostini_pref_names.h"
 #include "chrome/browser/ash/guest_os/guest_os_pref_names.h"
 #include "chrome/browser/ash/ownership/owner_settings_service_ash.h"

diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
index 743b9b9f..5f54c44 100644
--- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc
+++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc

@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/flat_set.h"

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 6fb7a0f..fec56e44 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"

diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 44cee0b4..f928ab0 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -125,7 +125,6 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ash/constants/ash_pref_names.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "chrome/browser/ash/accessibility/magnifier_type.h"
 #include "chrome/browser/ash/borealis/borealis_prefs.h"
 #include "chrome/browser/ash/crostini/crostini_pref_names.h"

diff --git a/chrome/browser/policy/test/accessibility_policy_browsertest.cc b/chrome/browser/policy/test/accessibility_policy_browsertest.cc
index 0308510d..e6c2261 100644
--- a/chrome/browser/policy/test/accessibility_policy_browsertest.cc
+++ b/chrome/browser/policy/test/accessibility_policy_browsertest.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 "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "build/build_config.h"
 #include "chrome/browser/ash/accessibility/accessibility_manager.h"
 #include "chrome/browser/ash/accessibility/magnification_manager.h"

diff --git a/chrome/browser/policy/test/policy_browsertest.cc b/chrome/browser/policy/test/policy_browsertest.cc
index 9941d2a5..5d1df99 100644
--- a/chrome/browser/policy/test/policy_browsertest.cc
+++ b/chrome/browser/policy/test/policy_browsertest.cc

@@ -151,7 +151,7 @@
 #include "url/origin.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "chrome/browser/ash/login/test/js_checker.h"
 #include "chrome/browser/ash/system/timezone_resolver_manager.h"
 #include "chrome/browser/chromeos/note_taking_helper.h"

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 7686eab..5795ded 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -261,7 +261,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ash/components/audio/audio_devices_pref_handler_impl.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
 #include "chrome/browser/apps/app_service/app_platform_metrics_service.h"
 #include "chrome/browser/apps/app_service/webapk/webapk_prefs.h"

diff --git a/chrome/browser/prefs/pref_service_incognito_allowlist.cc b/chrome/browser/prefs/pref_service_incognito_allowlist.cc
index ebe5b16..a559ce1 100644
--- a/chrome/browser/prefs/pref_service_incognito_allowlist.cc
+++ b/chrome/browser/prefs/pref_service_incognito_allowlist.cc

@@ -21,7 +21,7 @@
 #endif  // !defined(OS_ANDROID)
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 namespace {

diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test.js
index b6120f3..e9de15f4 100644
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test.js
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test.js

@@ -42,7 +42,6 @@
     GEN(`
 #include "ash/accessibility/accessibility_delegate.h"
 #include "ash/shell.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"

diff --git a/chrome/browser/sync/test/integration/single_client_os_preferences_sync_test.cc b/chrome/browser/sync/test/integration/single_client_os_preferences_sync_test.cc
index 43964844..507e41d 100644
--- a/chrome/browser/sync/test/integration/single_client_os_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_os_preferences_sync_test.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/shelf_prefs.h"
 #include "chrome/browser/sync/test/integration/os_sync_test.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"

diff --git a/chrome/browser/sync/test/integration/two_client_os_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_os_preferences_sync_test.cc
index b2387d4f..615ad31 100644
--- a/chrome/browser/sync/test/integration/two_client_os_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_os_preferences_sync_test.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 "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/shelf_prefs.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "chrome/browser/sync/test/integration/os_sync_test.h"

diff --git a/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc b/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc
index 0961857..8a719b4 100644
--- a/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc

@@ -12,7 +12,6 @@
 #include "ash/assistant/ui/assistant_ui_constants.h"
 #include "ash/assistant/ui/main_stage/assistant_ui_element_view.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/assistant/assistant_state.h"
 #include "ash/public/cpp/test/assistant_test_api.h"
 #include "base/auto_reset.h"

diff --git a/chrome/browser/ui/ash/assistant/device_actions.cc b/chrome/browser/ui/ash/assistant/device_actions.cc
index ca21860..a8dd9550 100644
--- a/chrome/browser/ui/ash/assistant/device_actions.cc
+++ b/chrome/browser/ui/ash/assistant/device_actions.cc

@@ -8,7 +8,7 @@
 #include <utility>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"

diff --git a/chrome/browser/ui/ash/chrome_shelf_prefs.cc b/chrome/browser/ui/ash/chrome_shelf_prefs.cc
index 64de612..871f60de 100644
--- a/chrome/browser/ui/ash/chrome_shelf_prefs.cc
+++ b/chrome/browser/ui/ash/chrome_shelf_prefs.cc

@@ -10,9 +10,9 @@
 #include <utility>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/public/cpp/app_list/internal_app_id_constants.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/values.h"
 #include "chrome/browser/ash/crosapi/browser_util.h"
 #include "chrome/browser/ash/login/demo_mode/demo_session.h"

diff --git a/chrome/browser/ui/ash/session_controller_client_impl.cc b/chrome/browser/ui/ash/session_controller_client_impl.cc
index 2609e64..33c1f80 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl.cc

@@ -8,7 +8,7 @@
 #include <memory>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/session/session_controller.h"
 #include "ash/public/cpp/session/session_types.h"
 #include "base/bind.h"

diff --git a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
index 9ceb59e1..b7eb8f8 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"

diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
index 0991939..6068f38 100644
--- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
+++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc

@@ -11,7 +11,7 @@
 
 #include "ash/constants/app_types.h"
 #include "ash/constants/ash_features.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/multi_user_window_manager.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/shelf_model.h"

diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc
index bd42e9fe..59b755e 100644
--- a/chrome/browser/ui/prefs/pref_watcher.cc
+++ b/chrome/browser/ui/prefs/pref_watcher.cc

@@ -19,7 +19,7 @@
 #include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #endif
 
 namespace {

diff --git a/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.cc
index 2e7a00d..c3ee366 100644
--- a/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/marketing_opt_in_screen_handler.h"
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram_functions.h"
 #include "chrome/browser/ash/login/screens/marketing_opt_in_screen.h"

diff --git a/chrome/browser/ui/webui/settings/chromeos/accessibility_section.cc b/chrome/browser/ui/webui/settings/chromeos/accessibility_section.cc
index f0ad40f..d9a8a83 100644
--- a/chrome/browser/ui/webui/settings/chromeos/accessibility_section.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/accessibility_section.cc

@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "ash/constants/ash_features.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/accessibility_controller_enums.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/tablet_mode.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
index 945609de..7997009d 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc

@@ -7,7 +7,7 @@
 #include <memory>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/power_utils.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler_browsertest.cc b/chrome/browser/ui/webui/settings/chromeos/device_power_handler_browsertest.cc
index 4d54e41..cd13651 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler_browsertest.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler_browsertest.cc

@@ -6,7 +6,7 @@
 #include <set>
 #include <utility>
 
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/run_loop.h"

diff --git a/chrome/browser/ui/webui/settings/chromeos/peripheral_data_access_handler.cc b/chrome/browser/ui/webui/settings/chromeos/peripheral_data_access_handler.cc
index e4756834..05de44a 100644
--- a/chrome/browser/ui/webui/settings/chromeos/peripheral_data_access_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/peripheral_data_access_handler.cc

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "ash/components/pcie_peripheral/pcie_peripheral_manager.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_path.h"

diff --git a/chrome/browser/ui/webui/settings/chromeos/switch_access_handler.cc b/chrome/browser/ui/webui/settings/chromeos/switch_access_handler.cc
index bec48aa..a4c6805 100644
--- a/chrome/browser/ui/webui/settings/chromeos/switch_access_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/switch_access_handler.cc

@@ -7,8 +7,8 @@
 #include <memory>
 
 #include "ash/constants/ash_constants.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/accessibility_controller.h"
-#include "ash/public/cpp/ash_pref_names.h"
 #include "base/bind.h"
 #include "base/no_destructor.h"
 #include "base/values.h"

diff --git a/components/exo/keyboard_unittest.cc b/components/exo/keyboard_unittest.cc
index a566be22..155d789 100644
--- a/components/exo/keyboard_unittest.cc
+++ b/components/exo/keyboard_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/constants/app_types.h"
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/external_arc/overlay/arc_overlay_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_helper.h"

diff --git a/components/soda/BUILD.gn b/components/soda/BUILD.gn
index 0cfbe26..92d152c 100644
--- a/components/soda/BUILD.gn
+++ b/components/soda/BUILD.gn

@@ -27,7 +27,7 @@
     ]
 
     deps += [
-      "//ash/public/cpp",
+      "//ash/constants",
       "//chromeos/dbus/dlcservice",
       "//ui/base",
     ]

diff --git a/components/soda/DEPS b/components/soda/DEPS
index 2a23cda..120f4b3 100644
--- a/components/soda/DEPS
+++ b/components/soda/DEPS

@@ -1,5 +1,5 @@
 include_rules = [
-  "+ash/public/cpp",
+  "+ash/constants",
   "+chromeos/dbus/dlcservice/dlcservice_client.h",
   "+components/component_updater/component_updater_paths.h",
   "+components/crx_file",

diff --git a/components/soda/soda_installer.cc b/components/soda/soda_installer.cc
index bc36f864..6252272 100644
--- a/components/soda/soda_installer.cc
+++ b/components/soda/soda_installer.cc

@@ -5,7 +5,7 @@
 #include "components/soda/soda_installer.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/public/cpp/ash_pref_names.h"
+#include "ash/constants/ash_pref_names.h"
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 #include "base/containers/contains.h"
 #include "base/feature_list.h"