Remove PrefService::PUBLIC flag from ash / chromeos pref registration

Chrome OS used to use the mojo preferences service, which required
prefs used across the browser/ash boundary to be flagged as PUBLIC.
Since mustash was cancelled we don't use the mojo service any more,
so the flag isn't needed.

This helps clarify which prefs are still actually using the mojo
preference service (e.g. assistant).

This CL is just cleanup, no behavior changes expected.

Bug: none
Change-Id: I4f53ff4f1dcaba600a797f61774c186459c751aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869672
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707566}

ash/display/display_prefs.cc

@@ -761,22 +761,14 @@ void StoreCurrentDisplayMixedMirrorModeParams(PrefService* pref_service) {
 
 // static
 void DisplayPrefs::RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterDictionaryPref(prefs::kSecondaryDisplays,
-                                   PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kDisplayProperties,
-                                   PrefRegistry::PUBLIC);
-  registry->RegisterStringPref(prefs::kDisplayPowerState, kDisplayPowerAllOn,
-                               PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kDisplayRotationLock,
-                                   PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kDisplayTouchAssociations,
-                                   PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kDisplayTouchPortAssociations,
-                                   PrefRegistry::PUBLIC);
-  registry->RegisterListPref(prefs::kExternalDisplayMirrorInfo,
-                             PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kDisplayMixedMirrorModeParams,
-                                   PrefRegistry::PUBLIC);
+  registry->RegisterDictionaryPref(prefs::kSecondaryDisplays);
+  registry->RegisterDictionaryPref(prefs::kDisplayProperties);
+  registry->RegisterStringPref(prefs::kDisplayPowerState, kDisplayPowerAllOn);
+  registry->RegisterDictionaryPref(prefs::kDisplayRotationLock);
+  registry->RegisterDictionaryPref(prefs::kDisplayTouchAssociations);
+  registry->RegisterDictionaryPref(prefs::kDisplayTouchPortAssociations);
+  registry->RegisterListPref(prefs::kExternalDisplayMirrorInfo);
+  registry->RegisterDictionaryPref(prefs::kDisplayMixedMirrorModeParams);
 }
 
 DisplayPrefs::DisplayPrefs(PrefService* local_state)

ash/magnifier/docked_magnifier_controller_impl.cc

@@ -156,12 +156,11 @@ void DockedMagnifierControllerImpl::RegisterProfilePrefs(
   if (for_test) {
     // In tests there is no remote pref service. Make ash own the prefs.
     // TODO(xiyuan): move ownership to ash.
-    registry->RegisterBooleanPref(prefs::kDockedMagnifierEnabled, false,
-                                  PrefRegistry::PUBLIC);
+    registry->RegisterBooleanPref(prefs::kDockedMagnifierEnabled, false);
   }
 
   registry->RegisterDoublePref(prefs::kDockedMagnifierScale,
-                               kDefaultMagnifierScale, PrefRegistry::PUBLIC);
+                               kDefaultMagnifierScale);
 }
 
 bool DockedMagnifierControllerImpl::GetEnabled() const {

ash/media/media_controller_impl.cc

@@ -46,8 +46,7 @@ MediaControllerImpl::~MediaControllerImpl() = default;
 
 // static
 void MediaControllerImpl::RegisterProfilePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kLockScreenMediaControlsEnabled, true,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterBooleanPref(prefs::kLockScreenMediaControlsEnabled, true);
 }
 
 bool MediaControllerImpl::AreLockScreenMediaKeysEnabled() const {

ash/shelf/shelf_controller.cc

@@ -126,18 +126,15 @@ void ShelfController::RegisterProfilePrefs(PrefRegistrySimple* registry) {
   // These prefs are public for ChromeLauncherController's OnIsSyncingChanged.
   // See the pref names definitions for explanations of the synced, local, and
   // per-display behaviors.
-  registry->RegisterStringPref(
-      prefs::kShelfAutoHideBehavior, kShelfAutoHideBehaviorNever,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC);
+  registry->RegisterStringPref(prefs::kShelfAutoHideBehavior,
+                               kShelfAutoHideBehaviorNever,
+                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kShelfAutoHideBehaviorLocal,
-                               std::string(), PrefRegistry::PUBLIC);
-  registry->RegisterStringPref(
-      prefs::kShelfAlignment, kShelfAlignmentBottom,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC);
-  registry->RegisterStringPref(prefs::kShelfAlignmentLocal, std::string(),
-                               PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kShelfPreferences,
-                                   PrefRegistry::PUBLIC);
+                               std::string());
+  registry->RegisterStringPref(prefs::kShelfAlignment, kShelfAlignmentBottom,
+                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kShelfAlignmentLocal, std::string());
+  registry->RegisterDictionaryPref(prefs::kShelfPreferences);
 }
 
 void ShelfController::OnActiveUserPrefServiceChanged(

ash/system/bluetooth/bluetooth_power_controller.cc

@@ -70,8 +70,7 @@ void BluetoothPowerController::RegisterLocalStatePrefs(
 // static
 void BluetoothPowerController::RegisterProfilePrefs(
     PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kUserBluetoothAdapterEnabled, false,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterBooleanPref(prefs::kUserBluetoothAdapterEnabled, false);
 }
 
 void BluetoothPowerController::StartWatchingActiveUserPrefsChanges() {

ash/system/message_center/message_center_controller.cc

@@ -34,10 +34,9 @@ namespace ash {
 // static
 void MessageCenterController::RegisterProfilePrefs(
     PrefRegistrySimple* registry) {
-  registry->RegisterStringPref(
-      prefs::kMessageCenterLockScreenMode,
-      prefs::kMessageCenterLockScreenModeHide,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC);
+  registry->RegisterStringPref(prefs::kMessageCenterLockScreenMode,
+                               prefs::kMessageCenterLockScreenModeHide,
+                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 namespace {

ash/system/network/vpn_list_view.cc

@@ -372,8 +372,7 @@ void VPNListView::OnVpnProvidersChanged() {
 }
 
 void VPNListView::RegisterProfilePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kVpnConfigAllowed, true,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterBooleanPref(prefs::kVpnConfigAllowed, true);
 }
 
 const char* VPNListView::GetClassName() const {

ash/system/night_light/night_light_controller_impl.cc

@@ -328,19 +328,15 @@ NightLightControllerImpl::~NightLightControllerImpl() {
 // static
 void NightLightControllerImpl::RegisterProfilePrefs(
     PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kNightLightEnabled, false,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterBooleanPref(prefs::kNightLightEnabled, false);
   registry->RegisterDoublePref(prefs::kNightLightTemperature,
-                               kDefaultColorTemperature, PrefRegistry::PUBLIC);
+                               kDefaultColorTemperature);
   registry->RegisterIntegerPref(prefs::kNightLightScheduleType,
-                                static_cast<int>(ScheduleType::kNone),
-                                PrefRegistry::PUBLIC);
+                                static_cast<int>(ScheduleType::kNone));
   registry->RegisterIntegerPref(prefs::kNightLightCustomStartTime,
-                                kDefaultStartTimeOffsetMinutes,
-                                PrefRegistry::PUBLIC);
+                                kDefaultStartTimeOffsetMinutes);
   registry->RegisterIntegerPref(prefs::kNightLightCustomEndTime,
-                                kDefaultEndTimeOffsetMinutes,
-                                PrefRegistry::PUBLIC);
+                                kDefaultEndTimeOffsetMinutes);
 
   // Non-public prefs, only meant to be used by ash.
   registry->RegisterDoublePref(prefs::kNightLightCachedLatitude, 0.0);

ash/system/palette/palette_tray.cc

@@ -205,18 +205,17 @@ PaletteTray::~PaletteTray() {
 
 // static
 void PaletteTray::RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kHasSeenStylus, false,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterBooleanPref(prefs::kHasSeenStylus, false);
 }
 
 // static
 void PaletteTray::RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kEnableStylusTools, true,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC);
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kLaunchPaletteOnEjectEvent, true,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC);
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 bool PaletteTray::ContainsPointInScreen(const gfx::Point& point) {

ash/system/power/power_prefs.cc

@@ -71,67 +71,45 @@ PrefService* GetPrefService() {
 // Registers power prefs whose default values are the same in user prefs and
 // signin prefs.
 void RegisterProfilePrefs(PrefRegistrySimple* registry, bool for_test) {
-  registry->RegisterIntegerPref(prefs::kPowerAcScreenBrightnessPercent, -1,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerAcScreenDimDelayMs, 420000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerAcScreenOffDelayMs, 450000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerAcScreenLockDelayMs, 0,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerAcIdleWarningDelayMs, 0,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerAcIdleDelayMs, 510000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenBrightnessPercent, -1,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenDimDelayMs, 300000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenOffDelayMs, 330000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenLockDelayMs, 0,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerBatteryIdleWarningDelayMs, 0,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerBatteryIdleDelayMs, 390000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerLockScreenDimDelayMs, 30000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerLockScreenOffDelayMs, 40000,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerAcIdleAction,
-                                chromeos::PowerPolicyController::ACTION_SUSPEND,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kPowerUseAudioActivity, true,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kPowerUseVideoActivity, true,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kPowerAllowWakeLocks, true,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kPowerAllowScreenWakeLocks, true,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterIntegerPref(prefs::kPowerAcScreenBrightnessPercent, -1);
+  registry->RegisterIntegerPref(prefs::kPowerAcScreenDimDelayMs, 420000);
+  registry->RegisterIntegerPref(prefs::kPowerAcScreenOffDelayMs, 450000);
+  registry->RegisterIntegerPref(prefs::kPowerAcScreenLockDelayMs, 0);
+  registry->RegisterIntegerPref(prefs::kPowerAcIdleWarningDelayMs, 0);
+  registry->RegisterIntegerPref(prefs::kPowerAcIdleDelayMs, 510000);
+  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenBrightnessPercent,
+                                -1);
+  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenDimDelayMs, 300000);
+  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenOffDelayMs, 330000);
+  registry->RegisterIntegerPref(prefs::kPowerBatteryScreenLockDelayMs, 0);
+  registry->RegisterIntegerPref(prefs::kPowerBatteryIdleWarningDelayMs, 0);
+  registry->RegisterIntegerPref(prefs::kPowerBatteryIdleDelayMs, 390000);
+  registry->RegisterIntegerPref(prefs::kPowerLockScreenDimDelayMs, 30000);
+  registry->RegisterIntegerPref(prefs::kPowerLockScreenOffDelayMs, 40000);
+  registry->RegisterIntegerPref(
+      prefs::kPowerAcIdleAction,
+      chromeos::PowerPolicyController::ACTION_SUSPEND);
+  registry->RegisterBooleanPref(prefs::kPowerUseAudioActivity, true);
+  registry->RegisterBooleanPref(prefs::kPowerUseVideoActivity, true);
+  registry->RegisterBooleanPref(prefs::kPowerAllowWakeLocks, true);
+  registry->RegisterBooleanPref(prefs::kPowerAllowScreenWakeLocks, true);
   registry->RegisterDoublePref(prefs::kPowerPresentationScreenDimDelayFactor,
-                               2.0, PrefRegistry::PUBLIC);
+                               2.0);
   registry->RegisterDoublePref(prefs::kPowerUserActivityScreenDimDelayFactor,
-                               2.0, PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kPowerWaitForInitialUserActivity, false,
-                                PrefRegistry::PUBLIC);
+                               2.0);
+  registry->RegisterBooleanPref(prefs::kPowerWaitForInitialUserActivity, false);
   registry->RegisterBooleanPref(
-      prefs::kPowerForceNonzeroBrightnessForUserActivity, true,
-      PrefRegistry::PUBLIC);
+      prefs::kPowerForceNonzeroBrightnessForUserActivity, true);
   registry->RegisterBooleanPref(prefs::kPowerFastSuspendWhenBacklightsForcedOff,
-                                true, PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kPowerSmartDimEnabled, true,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kPowerAlsLoggingEnabled, false,
-                                PrefRegistry::PUBLIC);
+                                true);
+  registry->RegisterBooleanPref(prefs::kPowerSmartDimEnabled, true);
+  registry->RegisterBooleanPref(prefs::kPowerAlsLoggingEnabled, false);
 
   if (for_test) {
-    registry->RegisterBooleanPref(prefs::kAllowScreenLock, true,
-                                  PrefRegistry::PUBLIC);
+    registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
     registry->RegisterBooleanPref(
         prefs::kEnableAutoScreenLock, false,
-        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF | PrefRegistry::PUBLIC);
+        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   }
 }
 
@@ -162,30 +140,21 @@ PowerPrefs::~PowerPrefs() {
 
 // static
 void PowerPrefs::RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kPowerPeakShiftEnabled, false,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerPeakShiftBatteryThreshold, -1,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kPowerPeakShiftDayConfig,
-                                   PrefRegistry::PUBLIC);
-
-  registry->RegisterBooleanPref(prefs::kBootOnAcEnabled, false,
-                                PrefRegistry::PUBLIC);
-
-  registry->RegisterBooleanPref(prefs::kAdvancedBatteryChargeModeEnabled, false,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterDictionaryPref(prefs::kAdvancedBatteryChargeModeDayConfig,
-                                   PrefRegistry::PUBLIC);
-
-  registry->RegisterIntegerPref(prefs::kBatteryChargeMode, -1,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kBatteryChargeCustomStartCharging, -1,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kBatteryChargeCustomStopCharging, -1,
-                                PrefRegistry::PUBLIC);
-
-  registry->RegisterBooleanPref(prefs::kUsbPowerShareEnabled, true,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterBooleanPref(prefs::kPowerPeakShiftEnabled, false);
+  registry->RegisterIntegerPref(prefs::kPowerPeakShiftBatteryThreshold, -1);
+  registry->RegisterDictionaryPref(prefs::kPowerPeakShiftDayConfig);
+
+  registry->RegisterBooleanPref(prefs::kBootOnAcEnabled, false);
+
+  registry->RegisterBooleanPref(prefs::kAdvancedBatteryChargeModeEnabled,
+                                false);
+  registry->RegisterDictionaryPref(prefs::kAdvancedBatteryChargeModeDayConfig);
+
+  registry->RegisterIntegerPref(prefs::kBatteryChargeMode, -1);
+  registry->RegisterIntegerPref(prefs::kBatteryChargeCustomStartCharging, -1);
+  registry->RegisterIntegerPref(prefs::kBatteryChargeCustomStopCharging, -1);
+
+  registry->RegisterBooleanPref(prefs::kUsbPowerShareEnabled, true);
 }
 
 // static
@@ -195,10 +164,10 @@ void PowerPrefs::RegisterSigninProfilePrefs(PrefRegistrySimple* registry,
 
   registry->RegisterIntegerPref(
       prefs::kPowerBatteryIdleAction,
-      chromeos::PowerPolicyController::ACTION_SHUT_DOWN, PrefRegistry::PUBLIC);
+      chromeos::PowerPolicyController::ACTION_SHUT_DOWN);
   registry->RegisterIntegerPref(
       prefs::kPowerLidClosedAction,
-      chromeos::PowerPolicyController::ACTION_SHUT_DOWN, PrefRegistry::PUBLIC);
+      chromeos::PowerPolicyController::ACTION_SHUT_DOWN);
 }
 
 // static
@@ -206,12 +175,12 @@ void PowerPrefs::RegisterUserProfilePrefs(PrefRegistrySimple* registry,
                                           bool for_test) {
   RegisterProfilePrefs(registry, for_test);
 
-  registry->RegisterIntegerPref(prefs::kPowerBatteryIdleAction,
-                                chromeos::PowerPolicyController::ACTION_SUSPEND,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kPowerLidClosedAction,
-                                chromeos::PowerPolicyController::ACTION_SUSPEND,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterIntegerPref(
+      prefs::kPowerBatteryIdleAction,
+      chromeos::PowerPolicyController::ACTION_SUSPEND);
+  registry->RegisterIntegerPref(
+      prefs::kPowerLidClosedAction,
+      chromeos::PowerPolicyController::ACTION_SUSPEND);
 }
 
 void PowerPrefs::ScreenIdleStateChanged(

ash/system/session/logout_button_tray.cc

@@ -56,10 +56,8 @@ LogoutButtonTray::~LogoutButtonTray() {
 
 // static
 void LogoutButtonTray::RegisterProfilePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kShowLogoutButtonInTray, false,
-                                PrefRegistry::PUBLIC);
-  registry->RegisterIntegerPref(prefs::kLogoutDialogDurationMs, 20000,
-                                PrefRegistry::PUBLIC);
+  registry->RegisterBooleanPref(prefs::kShowLogoutButtonInTray, false);
+  registry->RegisterIntegerPref(prefs::kLogoutDialogDurationMs, 20000);
 }
 
 void LogoutButtonTray::UpdateAfterShelfAlignmentChange() {

ash/touch/touch_devices_controller.cc

@@ -36,11 +36,9 @@ void TouchDevicesController::RegisterProfilePrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kTapDraggingEnabled, false,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF |
-          PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kTouchpadEnabled, PrefRegistry::PUBLIC);
-  registry->RegisterBooleanPref(prefs::kTouchscreenEnabled,
-                                PrefRegistry::PUBLIC);
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
+  registry->RegisterBooleanPref(prefs::kTouchpadEnabled, true);
+  registry->RegisterBooleanPref(prefs::kTouchscreenEnabled, true);
 }
 
 TouchDevicesController::TouchDevicesController() {

chrome/browser/chromeos/login/quick_unlock/pin_storage_prefs.cc

@@ -16,9 +16,7 @@ namespace quick_unlock {
 
 // static
 void PinStoragePrefs::RegisterProfilePrefs(PrefRegistrySimple* registry) {
-  // Mark it as PUBLIC so ash could access this pref.
-  registry->RegisterStringPref(ash::prefs::kQuickUnlockPinSalt, "",
-                               PrefRegistry::PUBLIC);
+  registry->RegisterStringPref(ash::prefs::kQuickUnlockPinSalt, "");
   registry->RegisterStringPref(prefs::kQuickUnlockPinSecret, "");
 }