Clean up code to wipe WEB_APK DataTypeStore
This code was added to clean up data that might have been left behind
due to a past bug. It has now been around long enough that all the
leftover data should've been cleaned up, so the cleanup logic can be
removed now.
This CL is effectively a partial revert of https://crrev.com/c/5868109.
Fixed: 365978267
Change-Id: I9c022ad023265304b4995a732b0f9a6960119f77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6534161
Reviewed-by: Mahmoud Rashad <[email protected]>
Commit-Queue: Marc Treib <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1458745}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 61746b09..b48408d 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1100,6 +1100,12 @@
inline constexpr char kManagedPrivateNetworkAccessRestrictionsEnabled[] =
"managed_private_network_access_restrictions_enabled";
+#if BUILDFLAG(IS_ANDROID)
+// Deprecated 05/2025.
+inline constexpr char kWipedWebAPkDataForMigration[] =
+ "sync.wiped_web_apk_data_for_migration";
+#endif // BUILDFLAG(IS_ANDROID)
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1549,6 +1555,11 @@
// Deprecated 05/2025
registry->RegisterBooleanPref(kManagedPrivateNetworkAccessRestrictionsEnabled,
false);
+
+ // Deprecated 05/2025.
+#if BUILDFLAG(IS_ANDROID)
+ registry->RegisterBooleanPref(kWipedWebAPkDataForMigration, false);
+#endif // BUILDFLAG(IS_ANDROID)
}
} // namespace
@@ -2842,6 +2853,11 @@
// Added 05/2025
profile_prefs->ClearPref(kManagedPrivateNetworkAccessRestrictionsEnabled);
+#if BUILDFLAG(IS_ANDROID)
+ // Added 05/2025.
+ profile_prefs->ClearPref(kWipedWebAPkDataForMigration);
+#endif // BUILDFLAG(IS_ANDROID)
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
