Skip to content

Commit

Permalink
Bug 1567076 - Replace test-unwatned-simple with moztest-unwatned-simp…
Browse files Browse the repository at this point in the history
…le r=gcp

Differential Revision: https://phabricator.services.mozilla.com/D57784
  • Loading branch information
DimiDL committed Dec 19, 2019
1 parent 79971e6 commit 8cd1fdc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions browser/components/preferences/in-content/privacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2047,7 +2047,7 @@ var gPrivacyPane = {
x =>
x !== "goog-unwanted-proto" &&
x !== "goog-unwanted-shavar" &&
x !== "test-unwanted-simple"
x !== "moztest-unwanted-simple"
);

if (blockUncommonUnwanted.checked) {
Expand All @@ -2057,7 +2057,7 @@ var gPrivacyPane = {
malware.push("goog-unwanted-proto");
}

malware.push("test-unwanted-simple");
malware.push("moztest-unwanted-simple");
}

// sort alphabetically to keep the pref consistent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ add_task(async function() {
testMalwareTable += ",test-malware-simple";
if (val1 && val2) {
testMalwareTable += ",goog-unwanted-" + (isV2 ? "shavar" : "proto");
testMalwareTable += ",test-unwanted-simple";
testMalwareTable += ",moztest-unwanted-simple";
}
Services.prefs.setCharPref("urlclassifier.malwareTable", testMalwareTable);

Expand Down Expand Up @@ -153,9 +153,9 @@ add_task(async function() {
);
}
is(
malwareTable.includes("test-unwanted-simple"),
malwareTable.includes("moztest-unwanted-simple"),
!checked,
"malware table doesn't include test-unwanted-simple"
"malware table doesn't include moztest-unwanted-simple"
);
let sortedMalware = malwareTable.slice(0);
sortedMalware.sort();
Expand Down

0 comments on commit 8cd1fdc

Please sign in to comment.