borealis: Remove token checking
In crrev.com/c/5138200 we adopted a flag which is strictly more powerful
than the previous token mechanism. In this CL we remove support for
setting/verifying the token
Bug: b/218403711
Change-Id: I65d1756d3c0fb99c1a5d83073416c627264aab6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5139118
Reviewed-by: Dominic Battre <[email protected]>
Reviewed-by: Chloe Pelling <[email protected]>
Code-Coverage: [email protected] <[email protected]>
Commit-Queue: Nic Hollingum <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1248433}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 23aeba22..4ec556a5 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -964,6 +964,11 @@
const char kPPAPISharedImagesForVideoDecoderAllowed[] =
"policy.ppapi_shared_images_for_video_decoder_allowed";
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+// Deprecated 01/2024.
+const char kBorealisVmTokenHash[] = "borealis.vm_token_hash";
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1357,9 +1362,10 @@
// Deprecated 01/2024.
registry->RegisterBooleanPref(kDownloadBubbleIphSuppression, false);
- // Deprecated 01/2024.
+// Deprecated 01/2024.
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterDictionaryPref(kPersistedSystemExtensions);
+ registry->RegisterStringPref(kBorealisVmTokenHash, "");
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
}
@@ -2592,9 +2598,10 @@
// Added 01/2024.
profile_prefs->ClearPref(kDownloadBubbleIphSuppression);
-#if BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 01/2024.
+#if BUILDFLAG(IS_CHROMEOS_ASH)
profile_prefs->ClearPref(kPersistedSystemExtensions);
+ profile_prefs->ClearPref(kBorealisVmTokenHash);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Please don't delete the following line. It is used by PRESUBMIT.py.
