Commit 342f0f7a authored by Kunihiko Sakamoto's avatar Kunihiko Sakamoto Committed by Commit Bot

Revert "Replacing "blacklist" with "blocklist" in...

Revert "Replacing "blacklist" with "blocklist" in IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_MALWARE.png.sha1"

This reverts commit 8aaf5430.

Reason for revert: Caused Deterministic Linux build failure:
https://ci.chromium.org/p/chromium/builders/ci/Deterministic%20Linux/28789


Original change's description:
> Replacing "blacklist" with "blocklist" in IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_MALWARE.png.sha1
> 
> Bug: 1097279
> Change-Id: Ie4ee96134433cd45432df96b047ff331eaeac573
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353400
> Commit-Queue: Elaine Chien <elainec@chromium.org>
> Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#797879}

TBR=karandeepb@chromium.org,elainec@chromium.org

Change-Id: I3eec50e43777b1b77825185ab10242eb8fbc2e23
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1097279
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2355350Reviewed-by: default avatarKunihiko Sakamoto <ksakamoto@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797979}
parent ebf1f745
...@@ -3812,7 +3812,7 @@ are declared in tools/grit/grit_rule.gni. ...@@ -3812,7 +3812,7 @@ are declared in tools/grit/grit_rule.gni.
<message name="IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_OTHER" desc="A statement that an extension has been newly blacklisted. https://support.google.com/chrome/answer/1210215 contains the language on which we're basing the phrasing."> <message name="IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_OTHER" desc="A statement that an extension has been newly blacklisted. https://support.google.com/chrome/answer/1210215 contains the language on which we're basing the phrasing.">
The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" was automatically disabled. The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" was automatically disabled.
</message> </message>
<message name="IDS_EXTENSION_ALERT_ITEM_BLOCKLISTED_MALWARE" desc="A statement that an extension has been newly blocklisted for malware."> <message name="IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_MALWARE" desc="A statement that an extension has been newly blacklisted for malware.">
"<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been disabled because it contains malware "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been disabled because it contains malware
</message> </message>
<message name="IDS_APP_ALERT_ITEM_BLACKLISTED_OTHER" desc="A statement that a packaged app has been newly blacklisted. https://support.google.com/chrome/answer/1210215 contains the language on which we're basing the phrasing."> <message name="IDS_APP_ALERT_ITEM_BLACKLISTED_OTHER" desc="A statement that a packaged app has been newly blacklisted. https://support.google.com/chrome/answer/1210215 contains the language on which we're basing the phrasing.">
......
...@@ -58,7 +58,7 @@ std::vector<base::string16> GenerateMessage( ...@@ -58,7 +58,7 @@ std::vector<base::string16> GenerateMessage(
int id = 0; int id = 0;
if (disable_remotely_for_malware || if (disable_remotely_for_malware ||
(blocklist_state == BlocklistState::BLOCKLISTED_MALWARE)) { (blocklist_state == BlocklistState::BLOCKLISTED_MALWARE)) {
id = IDS_EXTENSION_ALERT_ITEM_BLOCKLISTED_MALWARE; id = IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_MALWARE;
} else { } else {
id = extension->is_app() ? IDS_APP_ALERT_ITEM_BLACKLISTED_OTHER id = extension->is_app() ? IDS_APP_ALERT_ITEM_BLACKLISTED_OTHER
: IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_OTHER; : IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_OTHER;
......
...@@ -107,6 +107,6 @@ TEST(ExtensionErrorUIDefaultTest, BubbleMessageMentionsMalware) { ...@@ -107,6 +107,6 @@ TEST(ExtensionErrorUIDefaultTest, BubbleMessageMentionsMalware) {
std::vector<base::string16> messages = bubble->GetBubbleViewMessages(); std::vector<base::string16> messages = bubble->GetBubbleViewMessages();
EXPECT_THAT(messages, testing::ElementsAre(l10n_util::GetStringFUTF16( EXPECT_THAT(messages, testing::ElementsAre(l10n_util::GetStringFUTF16(
IDS_EXTENSION_ALERT_ITEM_BLOCKLISTED_MALWARE, IDS_EXTENSION_ALERT_ITEM_BLACKLISTED_MALWARE,
base::UTF8ToUTF16(extension->name())))); base::UTF8ToUTF16(extension->name()))));
} }
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