Replace 'whitelist' and 'blacklist' with 'allowlist' and 'denylist' in //chrome/browser/supervised_user
This CL leaves all user-facing or risky uses in place, and leaves them
for followup CLs where they can get more close scrutiny. The remaining
uses are:
1. SupervisedUserWhitelistInstaller, which lives in
//chrome/browser/component_udpater. This is tracked in
http://crbug.com/1097254
2. The "whitelist" key in the json content of the serialized whitelist
file. I left this as-is for now because a simple rename would prevent
existing whitelist files from loading correctly.
3. ManagedUserWhitelistSpecifics, which is a Message in the protobuf
used for syncing. I believe this can be renamed without issue, but
that would be done in a followup.
4. ManagedUsers.Whitelist.Count, ManagedUsers_Whitelist_Added,
ManagedUsers_Whitelist_Removed, metrics. We can't rename these
without decoupling them from their historical data. We may be able
to create a formula to merge the old and new names, and base any
alerts/dashboards on the formula.
5. "BlacklistOnly" trial group in the "SafeSites" field trial. It's
unclear if this can be safely renamed.
6. "blacklist-20141001-1k.bin" is a file downloaded from gstatic with
the default denylist. We can rename this once we copy the file in
gstatic to a new filename.
7. "su-blacklist.bin" is the path of the denylist file that's stored in
the user's data directory. Renaming this will require us to support
both paths in the future. This also left as a followup.
8. "Blacklist active", "Blacklist", "Whitelist" in
about:supervised-user-internals. This can be done in a followup due
to it being a user-facing change.
9. "install-supervised-user-whitelists" switch, which is supposedly
only used for testing. This can be done in a followup.
Bug: 1097253
Change-Id: I7637c1f16a49e1dd7836a3fbe81122a69961270d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316889
Commit-Queue: Robbie McElrath <[email protected]>
Reviewed-by: Aga Wronska <[email protected]>
Reviewed-by: Ted Choc <[email protected]>
Cr-Commit-Position: refs/heads/master@{#798800}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 09509b5..e94c6e317 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -208,8 +208,8 @@
#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"
-#include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
#endif
#if defined(OS_ANDROID)
@@ -991,7 +991,7 @@
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
ChildAccountService::RegisterProfilePrefs(registry);
SupervisedUserService::RegisterProfilePrefs(registry);
- SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
+ SupervisedUserAllowlistService::RegisterProfilePrefs(registry);
#endif
#if defined(OS_ANDROID)
