Commit bdd78c15 authored by Rainhard Findling's avatar Rainhard Findling Committed by Commit Bot

Safety check: remove unused WebUI update IDs

Removes kPasswordsCompromised, kExtensionsReenabledByUser, and
kExtensionsReenabledByAdmin from the SafetyCheckHandler. Those are
no longer used, since the WebUI strings are nowadays constructed
directly in C++ and are sent to UI in WebUI updates.

Bug: 1015841
Change-Id: I76baf7916c9fcafab7a0e3aee6b9c2abe3ca151f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552782Reviewed-by: default avatarAndrey Zaytsev <andzaytsev@google.com>
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830161}
parent 3d1a6860
......@@ -60,9 +60,6 @@ constexpr char kPerformSafetyCheck[] = "performSafetyCheck";
constexpr char kGetParentRanDisplayString[] = "getSafetyCheckRanDisplayString";
constexpr char kNewState[] = "newState";
constexpr char kDisplayString[] = "displayString";
constexpr char kPasswordsCompromised[] = "passwordsCompromised";
constexpr char kExtensionsReenabledByUser[] = "extensionsReenabledByUser";
constexpr char kExtensionsReenabledByAdmin[] = "extensionsReenabledByAdmin";
// Converts the VersionUpdater::Status to the UpdateStatus enum to be passed
// to the safety check frontend. Note: if the VersionUpdater::Status gets
......@@ -506,9 +503,6 @@ void SafetyCheckHandler::OnPasswordsCheckResult(PasswordsStatus status,
Total total) {
base::DictionaryValue event;
event.SetIntKey(kNewState, static_cast<int>(status));
if (status == PasswordsStatus::kCompromisedExist) {
event.SetIntKey(kPasswordsCompromised, compromised.value());
}
event.SetStringKey(kDisplayString,
GetStringForPasswords(status, compromised, done, total));
FireWebUIListener(kPasswordsEvent, event);
......@@ -527,14 +521,6 @@ void SafetyCheckHandler::OnExtensionsCheckResult(
ReenabledAdmin reenabled_admin) {
base::DictionaryValue event;
event.SetIntKey(kNewState, static_cast<int>(status));
if (status == ExtensionsStatus::kBlocklistedReenabledAllByUser ||
status == ExtensionsStatus::kBlocklistedReenabledSomeByUser) {
event.SetIntKey(kExtensionsReenabledByUser, reenabled_user.value());
}
if (status == ExtensionsStatus::kBlocklistedReenabledAllByAdmin ||
status == ExtensionsStatus::kBlocklistedReenabledSomeByUser) {
event.SetIntKey(kExtensionsReenabledByAdmin, reenabled_admin.value());
}
event.SetStringKey(kDisplayString,
GetStringForExtensions(status, Blocklisted(blocklisted),
reenabled_user, reenabled_admin));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment