Deprecate kDeviceRegisteredTime.
We decided to use OOBE complete flag file instead so this prefs is not
used any more.
Bug: 338648208
Change-Id: Ic012bef7f15cc756b4e436bc613ec4a7ea268765
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5515253
Reviewed-by: Dominic Battre <[email protected]>
Commit-Queue: Li Lin <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1297547}
diff --git a/chrome/browser/ash/login/startup_utils.cc b/chrome/browser/ash/login/startup_utils.cc
index 4ab45ed8..5d55f9c5 100644
--- a/chrome/browser/ash/login/startup_utils.cc
+++ b/chrome/browser/ash/login/startup_utils.cc
@@ -68,13 +68,6 @@
prefs->CommitPendingWrite();
}
-// Saves time "Local State" preference and forces its persistence to disk.
-void SaveTimePreferenceForced(const char* pref_name, base::Time value) {
- PrefService* prefs = g_browser_process->local_state();
- prefs->SetTime(pref_name, value);
- prefs->CommitPendingWrite();
-}
-
// Returns the path to flag file indicating that both parts of OOBE were
// completed.
// On chrome device, returns /home/chronos/.oobe_completed.
@@ -114,7 +107,6 @@
registry->RegisterStringPref(prefs::kOobeScreenPending, "");
registry->RegisterTimePref(prefs::kOobeStartTime, base::Time());
registry->RegisterIntegerPref(::prefs::kDeviceRegistered, -1);
- registry->RegisterTimePref(ash::prefs::kDeviceRegisteredTime, base::Time());
registry->RegisterBooleanPref(::prefs::kEnrollmentRecoveryRequired, false);
registry->RegisterStringPref(::prefs::kInitialLocale, "en-US");
registry->RegisterBooleanPref(kDisableHIDDetectionScreenForTests, false);
@@ -266,9 +258,6 @@
void StartupUtils::MarkDeviceRegistered(base::OnceClosure done_callback) {
SaveIntegerPreferenceForced(::prefs::kDeviceRegistered, 1);
- SaveTimePreferenceForced(ash::prefs::kDeviceRegisteredTime,
- base::Time::Now());
-
auto* host = LoginDisplayHost::default_host();
if (host) {
host->GetOobeMetricsHelper()->RecordDeviceRegistered();
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2dacf8a..47e549d 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1055,6 +1055,10 @@
constexpr char kMetricsUserInheritOwnerConsent[] =
"metrics.user_inherit_owner_consent";
constexpr char kGlanceablesEnabled[] = "ash.glanceables_enabled";
+
+// Deprecated 05/2024.
+// A preference to keep track of the device registered time.
+constexpr char kDeviceRegisteredTime[] = "DeviceRegisteredTime";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if !BUILDFLAG(IS_ANDROID)
@@ -1181,6 +1185,9 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 03/2024.
registry->RegisterBooleanPref(kOobeGuestAcceptedTos, false);
+
+ // Deprecated 05/2024.
+ registry->RegisterTimePref(kDeviceRegisteredTime, base::Time());
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 04/2024.
@@ -1516,8 +1523,8 @@
// Deprecated 04/2024.
registry->RegisterTimePref(kDIPSTimerLastUpdate, base::Time());
- // Deprecated 04/2024.
#if BUILDFLAG(IS_CHROMEOS_ASH)
+ // Deprecated 04/2024.
registry->RegisterBooleanPref(kMetricsUserInheritOwnerConsent, true);
registry->RegisterBooleanPref(kGlanceablesEnabled, true);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -2430,6 +2437,9 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Added 03/2024.
local_state->ClearPref(kOobeGuestAcceptedTos);
+
+ // Added 05/2024.
+ local_state->ClearPref(kDeviceRegisteredTime);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 04/2024 .
@@ -2866,8 +2876,8 @@
// Added 04/2024.
profile_prefs->ClearPref(kDIPSTimerLastUpdate);
- // Added 04/2024.
#if BUILDFLAG(IS_CHROMEOS_ASH)
+ // Added 04/2024.
profile_prefs->ClearPref(kMetricsUserInheritOwnerConsent);
profile_prefs->ClearPref(kGlanceablesEnabled);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
