Deprecate policy-to-pref mapping for CloudPolicyOverridesPlatformPolicy.
CloudPolicyOverridesPlatformPolicy was refactored to be dynamically
read by the policy management system and no longer needs to be stored in
prefs. This CL deprecates the policy-to-pref mapping corresponding to
the policy.
Bug: 1011820, b/191893338, b/201060582
Change-Id: I143d2bc99215ecabbee4e4baeb1930592e5b246b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3153457
Commit-Queue: Igor Ruvinov <[email protected]>
Reviewed-by: Gabriel Charette <[email protected]>
Reviewed-by: Owen Min <[email protected]>
Cr-Commit-Position: refs/heads/main@{#924761}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index af47cdf..ab70bc9 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -470,19 +470,6 @@
"local_discovery.notifications_enabled";
#endif
-// Deprecated 9/2020
-const char kBlockThirdPartyCookies[] = "profile.block_third_party_cookies";
-
-// Deprecated 9/2020
-const char kPluginsDeprecationInfobarLastShown[] =
- "plugins.deprecation_infobar_last_shown";
-
-const char kPasswordManagerOnboardingState[] =
- "profile.password_manager_onboarding_state";
-
-const char kWasOnboardingFeatureCheckedBefore[] =
- "profile.was_pwm_onboarding_feature_checked_before";
-
// Deprecated 10/2020
const char kHistoryMenuPromoShown[] = "history.menu_promo_shown";
@@ -672,6 +659,7 @@
const char kPrivacyBudgetActiveSurfaces[] = "privacy_budget.active_surfaces";
const char kPrivacyBudgetRetiredSurfaces[] = "privacy_budget.retired_surfaces";
const char kPrivacyBudgetSeed[] = "privacy_budget.randomizer_seed";
+const char kCloudPolicyOverridesPlatformPolicy[] = "policy.cloud_override";
// Register local state used only for migration (clearing or moving to a new
// key).
@@ -706,6 +694,8 @@
registry->RegisterBooleanPref(kUserAgentClientHintsEnabled, true);
+ registry->RegisterBooleanPref(kCloudPolicyOverridesPlatformPolicy, false);
+
#if BUILDFLAG(ENABLE_EXTENSIONS)
registry->RegisterBooleanPref(kPinnedExtensionsMigrationComplete, false);
#endif
@@ -728,13 +718,6 @@
chrome_browser_net::secure_dns::RegisterProbesSettingBackupPref(registry);
- registry->RegisterBooleanPref(kBlockThirdPartyCookies, false);
-
- registry->RegisterTimePref(kPluginsDeprecationInfobarLastShown, base::Time());
-
- registry->RegisterIntegerPref(kPasswordManagerOnboardingState, 0);
- registry->RegisterBooleanPref(kWasOnboardingFeatureCheckedBefore, false);
-
registry->RegisterBooleanPref(prefs::kWebAppsUserDisplayModeCleanedUp, false);
registry->RegisterBooleanPref(kHistoryMenuPromoShown, true);
@@ -1483,6 +1466,9 @@
local_state->ClearPref(kPrivacyBudgetRetiredSurfaces);
local_state->ClearPref(kPrivacyBudgetSeed);
+ // Added 09/2021.
+ local_state->ClearPref(kCloudPolicyOverridesPlatformPolicy);
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_LOCAL_STATE_PREFS
}
@@ -1508,14 +1494,6 @@
chrome_browser_net::secure_dns::MigrateProbesSettingToOrFromBackup(
profile_prefs);
- // Added 9/2020
- profile_prefs->ClearPref(kBlockThirdPartyCookies);
-
- // Added 9/2020
- profile_prefs->ClearPref(kPluginsDeprecationInfobarLastShown);
- profile_prefs->ClearPref(kPasswordManagerOnboardingState);
- profile_prefs->ClearPref(kWasOnboardingFeatureCheckedBefore);
-
// Added 10/2020
profile_prefs->ClearPref(kHistoryMenuPromoShown);
