Remove policy.used_policy_certificates pref on ChromeOS
This pref was previously used to indicate if a profile had at any
point used a policy-provided enterprise certificate for certificate
validation, but only on ChromeOS.
The only two usages of this pref were removed in crrev.com/c/6169182
and crrev.com/c/6107630.
Bug: 40928765
Change-Id: I038a57617a771bb78442367cd5a91f87ee629c30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6177329
Commit-Queue: Hubert Chao <[email protected]>
Reviewed-by: Matt Mueller <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Owners-Override: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1407393}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index d09c3bf..e0f173f 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -329,7 +329,6 @@
#include "chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_registry_util.h"
#include "chrome/browser/memory/oom_kills_monitor.h"
#include "chrome/browser/policy/annotations/blocklist_handler.h"
-#include "chrome/browser/policy/networking/policy_cert_service.h"
#include "chrome/browser/policy/system_features_disable_list_policy_handler.h"
#include "chrome/browser/ui/webui/certificates_handler.h"
#include "chromeos/ui/wm/fullscreen/pref_names.h"
@@ -1130,6 +1129,12 @@
inline constexpr char kSafeBrowsingAutomaticDeepScanPerformed[] =
"safe_browsing.automatic_deep_scan_performed";
+#if BUILDFLAG(IS_CHROMEOS)
+// Deprecated 01/2025.
+inline constexpr char kUsedPolicyCertificates[] =
+ "policy.used_policy_certificates";
+#endif // BUILDFLAG(IS_CHROMEOS)
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1591,6 +1596,11 @@
registry->RegisterBooleanPref(kSafeBrowsingAutomaticDeepScanningIPHSeen,
false);
registry->RegisterBooleanPref(kSafeBrowsingAutomaticDeepScanPerformed, false);
+
+#if BUILDFLAG(IS_CHROMEOS)
+ // Deprecated 01/2025.
+ registry->RegisterBooleanPref(kUsedPolicyCertificates, false);
+#endif // BUILDFLAG(IS_CHROMEOS)
}
} // namespace
@@ -2143,7 +2153,6 @@
chromeos::cloud_storage::RegisterProfilePrefs(registry);
chromeos::cloud_upload::RegisterProfilePrefs(registry);
policy::NetworkAnnotationBlocklistHandler::RegisterPrefs(registry);
- policy::PolicyCertService::RegisterProfilePrefs(registry);
quickoffice::RegisterProfilePrefs(registry);
registry->RegisterBooleanPref(prefs::kDeskAPIThirdPartyAccessEnabled, false);
registry->RegisterBooleanPref(prefs::kDeskAPIDeskSaveAndShareEnabled, false);
@@ -2885,6 +2894,11 @@
profile_prefs->ClearPref(kSafeBrowsingAutomaticDeepScanPerformed);
profile_prefs->ClearPref(kSafeBrowsingAutomaticDeepScanningIPHSeen);
+#if BUILDFLAG(IS_CHROMEOS)
+ // Added 01/2025.
+ profile_prefs->ClearPref(kUsedPolicyCertificates);
+#endif // BUILDFLAG(IS_CHROMEOS)
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
