Remove content packs for supervised user
Playpen Content Packs feature for supervised users has never been
launched.The code contains non-inclusive language and rather than
fixing the language is gets well deserved removal.
This change-list covers deletion of:
* SupervisedUserWhitelistInstaller
* SupervisedUserAllowlistService
* Relevant test files
It will be followed with the further cleanup in c/b/c/supervised_user
as well as in Chrome Sync code.
Bug: 1147260, 1151166
Change-Id: I938e2ba34bbe91013b54ea152b29fdff424253f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543804
Commit-Queue: Aga Wronska <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Reviewed-by: Steven Holte <[email protected]>
Reviewed-by: Marc Treib <[email protected]>
Reviewed-by: Bernhard Bauer <[email protected]>
Cr-Commit-Position: refs/heads/master@{#833986}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 1a181d49..58a0fba 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -200,7 +200,6 @@
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
#include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
-#include "chrome/browser/supervised_user/supervised_user_allowlist_service.h"
#include "chrome/browser/supervised_user/supervised_user_service.h"
#endif
@@ -458,6 +457,13 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 4/2020
const char kSupervisedUsersNextId[] = "LocallyManagedUsersNextId";
+
+// Deprecated 11/2020
+const char kRegisteredSupervisedUserAllowlists[] =
+ "supervised_users.whitelists";
+
+// Deprecated 11/2020
+const char kSupervisedUserAllowlists[] = "profile.managed.whitelists";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 6/2020
@@ -509,6 +515,7 @@
registry->RegisterStringPref(kInvalidatorClientId, std::string());
#if BUILDFLAG(IS_CHROMEOS_ASH)
+ registry->RegisterDictionaryPref(kRegisteredSupervisedUserAllowlists);
registry->RegisterIntegerPref(kSupervisedUsersNextId, 0);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
}
@@ -525,6 +532,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterBooleanPref(
kDisplayRotationAcceleratorDialogHasBeenAccepted, false);
+ registry->RegisterDictionaryPref(kSupervisedUserAllowlists);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterBooleanPref(kBlacklistedCredentialsNormalized, false);
@@ -893,7 +901,6 @@
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
ChildAccountService::RegisterProfilePrefs(registry);
SupervisedUserService::RegisterProfilePrefs(registry);
- SupervisedUserAllowlistService::RegisterProfilePrefs(registry);
#endif
#if defined(OS_ANDROID)
@@ -1096,6 +1103,9 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Added 4/2020.
local_state->ClearPref(kSupervisedUsersNextId);
+
+ // Added 11/2020.
+ local_state->ClearPref(kRegisteredSupervisedUserAllowlists);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Please don't delete the following line. It is used by PRESUBMIT.py.
@@ -1198,6 +1208,11 @@
// Added 11/2020
profile_prefs->ClearPref(kDRMSalt);
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ // Added 11/2020.
+ profile_prefs->ClearPref(kSupervisedUserAllowlists);
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
}
