Bug 1277378 - Fix typo in Safe Browsing in-content preferences. r?past
MozReview-Commit-ID: KfZpVRWuzjV
--- a/browser/components/preferences/in-content/security.js
+++ b/browser/components/preferences/in-content/security.js
@@ -184,20 +184,20 @@ var gSecurityPane = {
});
blockUncommonUnwanted.addEventListener("command", function() {
blockUnwantedPref.value = blockUncommonUnwanted.checked;
blockUncommonPref.value = blockUncommonUnwanted.checked;
let malware = malwareTable.value
.split(",")
- .filter(x => x !== "goog-unwanted-simple" && x !== "test-unwanted-simple");
+ .filter(x => x !== "goog-unwanted-shavar" && x !== "test-unwanted-simple");
if (blockUncommonUnwanted.checked) {
- malware.push("goog-unwanted-simple");
+ malware.push("goog-unwanted-shavar");
malware.push("test-unwanted-simple");
}
// sort alphabetically to keep the pref consistent
malware.sort();
malwareTable.value = malware.join(",");
});
--- a/browser/components/preferences/in-content/tests/browser_security.js
+++ b/browser/components/preferences/in-content/tests/browser_security.js
@@ -107,18 +107,18 @@ add_task(function*() {
// check that both settings are now turned on or off
is(Services.prefs.getBoolPref("browser.safebrowsing.downloads.remote.block_potentially_unwanted"), !checked,
"block_potentially_unwanted is set correctly");
is(Services.prefs.getBoolPref("browser.safebrowsing.downloads.remote.block_uncommon"), !checked,
"block_uncommon is set correctly");
// when the preference is on, the malware table should include these ids
let malwareTable = Services.prefs.getCharPref("urlclassifier.malwareTable").split(",");
- is(malwareTable.includes("goog-unwanted-simple"), !checked,
- "malware table doesn't include goog-unwanted-simple");
+ is(malwareTable.includes("goog-unwanted-shavar"), !checked,
+ "malware table doesn't include goog-unwanted-shavar");
is(malwareTable.includes("test-unwanted-simple"), !checked,
"malware table doesn't include test-unwanted-simple");
let sortedMalware = malwareTable.slice(0);
sortedMalware.sort();
Assert.deepEqual(malwareTable, sortedMalware, "malware table has been sorted");
yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
}