Bug 1277378 - Fix typo in Safe Browsing in-content preferences. r=past, a=lizzard
authorFrancois Marier <francois@mozilla.com>
Wed, 01 Jun 2016 16:35:48 -0700
changeset 333231 15bb21e207853ad8c1c4761205dfbd60118224c7
parent 333230 c2324a8ecaaea61e61c79d1823433ef3a0e53ee9
child 333232 31d4316fa44cc0e9b1cf661b7000cc8dc5093b62
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspast, lizzard
bugs1277378
milestone48.0a2
Bug 1277378 - Fix typo in Safe Browsing in-content preferences. r=past, a=lizzard MozReview-Commit-ID: KfZpVRWuzjV
browser/components/preferences/in-content/security.js
browser/components/preferences/in-content/tests/browser_security.js
--- 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);
   }