PolicyCertService: migrate kUsedPolicyCertificates preference
Migrate kUsedPolicyCertificates preference from local state into
per-profile pref storage.
This allows to reduce the class' dependency on the concept of a
user that will help reusing it in Lacros.
Bug: b:197082588
Test: *MultiProfile*, *SessionController*, *WebRtcEncryption*
Change-Id: I27202e3fa690cd2b623e115e8b78b8b112a15a96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3212033
Commit-Queue: Michael Ershov <[email protected]>
Reviewed-by: Pavol Marko <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Cr-Commit-Position: refs/heads/main@{#931181}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2720b7b8..acbed1e 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -335,7 +335,7 @@
#include "chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h"
#include "chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h"
#include "chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h"
-#include "chrome/browser/ash/policy/networking/policy_cert_service_factory.h"
+#include "chrome/browser/ash/policy/networking/policy_cert_service.h"
#include "chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h"
#include "chrome/browser/ash/policy/reporting/arc_app_install_event_logger.h"
#include "chrome/browser/ash/policy/reporting/extension_install_event_log_manager_wrapper.h"
@@ -693,8 +693,9 @@
0);
registry->RegisterInt64Pref(kFeatureUsageDailySampleESim, 0);
-
registry->RegisterIntegerPref(kTimesHIDDialogShown, 0);
+ // Deprecated 10/2021.
+ registry->RegisterListPref(prefs::kUsedPolicyCertificates);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if !defined(OS_ANDROID)
@@ -1053,7 +1054,6 @@
policy::DMTokenStorage::RegisterPrefs(registry);
policy::EnrollmentRequisitionManager::RegisterPrefs(registry);
policy::MinimumVersionPolicyHandler::RegisterPrefs(registry);
- policy::PolicyCertServiceFactory::RegisterPrefs(registry);
policy::TPMAutoUpdateModePolicyHandler::RegisterPrefs(registry);
policy::SystemFeaturesDisableListPolicyHandler::RegisterPrefs(registry);
quirks::QuirksManager::RegisterPrefs(registry);
@@ -1372,6 +1372,7 @@
ash::cert_provisioning::RegisterProfilePrefs(registry);
borealis::prefs::RegisterProfilePrefs(registry);
ash::ChromeScanningAppDelegate::RegisterProfilePrefs(registry);
+ policy::PolicyCertService::RegisterProfilePrefs(registry);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_LACROS)
