Backed out changeset 1575ef52aa22 (bug 1394053) for failures in browser_security-1.js,browser_security-2.js,browser_security.js a=bustage CLOSED TREE

MozReview-Commit-ID: G8PrqcM5UYf

browser/components/preferences/in-content-new/privacy.js

@@ -1077,23 +1077,16 @@ var gPrivacyPane = {
       safeBrowsingMalwarePref.value = enableSafeBrowsing.checked;
 
       if (enableSafeBrowsing.checked) {
-        if (blockDownloads) {
         blockDownloads.removeAttribute("disabled");
         if (blockDownloads.checked) {
           blockUncommonUnwanted.removeAttribute("disabled");
         }
       } else {
-          blockUncommonUnwanted.removeAttribute("disabled");
-        }
-      } else {
-        if (blockDownloads) {
         blockDownloads.setAttribute("disabled", "true");
-        }
         blockUncommonUnwanted.setAttribute("disabled", "true");
       }
     });
 
-    if (blockDownloads) {
     blockDownloads.addEventListener("command", function() {
       blockDownloadsPref.value = blockDownloads.checked;
       if (blockDownloads.checked) {
@@ -1102,7 +1095,6 @@ var gPrivacyPane = {
         blockUncommonUnwanted.setAttribute("disabled", "true");
       }
     });
-    }
 
     blockUncommonUnwanted.addEventListener("command", function() {
       blockUnwantedPref.value = blockUncommonUnwanted.checked;
@@ -1134,19 +1126,14 @@ var gPrivacyPane = {
 
     enableSafeBrowsing.checked = safeBrowsingPhishingPref.value && safeBrowsingMalwarePref.value;
     if (!enableSafeBrowsing.checked) {
-      if (blockDownloads) {
       blockDownloads.setAttribute("disabled", "true");
-      }
-
       blockUncommonUnwanted.setAttribute("disabled", "true");
     }
 
-    if (blockDownloads) {
     blockDownloads.checked = blockDownloadsPref.value;
     if (!blockDownloadsPref.value) {
       blockUncommonUnwanted.setAttribute("disabled", "true");
     }
-    }
 
     blockUncommonUnwanted.checked = blockUnwantedPref.value && blockUncommonPref.value;
   },

browser/components/preferences/in-content-new/privacy.xul

@@ -732,11 +732,9 @@
             label="&enableSafeBrowsing.label;"
             accesskey="&enableSafeBrowsing.accesskey;" />
   <vbox class="indent">
-#ifdef MOZILLA_OFFICIAL
     <checkbox id="blockDownloads"
               label="&blockDownloads.label;"
               accesskey="&blockDownloads.accesskey;" />
-#endif
     <checkbox id="blockUncommonUnwanted"
               label="&blockUncommonAndUnwanted.label;"
               accesskey="&blockUncommonAndUnwanted.accesskey;" />

browser/components/preferences/in-content/security.js

@@ -174,23 +174,16 @@ var gSecurityPane = {
       safeBrowsingMalwarePref.value = enableSafeBrowsing.checked;
 
       if (enableSafeBrowsing.checked) {
-        if (blockDownloads) {
         blockDownloads.removeAttribute("disabled");
         if (blockDownloads.checked) {
           blockUncommonUnwanted.removeAttribute("disabled");
         }
       } else {
-          blockUncommonUnwanted.removeAttribute("disabled");
-        }
-      } else {
-        if (blockDownloads) {
         blockDownloads.setAttribute("disabled", "true");
-        }
         blockUncommonUnwanted.setAttribute("disabled", "true");
       }
     });
 
-    if (blockDownloads) {
     blockDownloads.addEventListener("command", function() {
       blockDownloadsPref.value = blockDownloads.checked;
       if (blockDownloads.checked) {
@@ -199,7 +192,6 @@ var gSecurityPane = {
         blockUncommonUnwanted.setAttribute("disabled", "true");
       }
     });
-    }
 
     blockUncommonUnwanted.addEventListener("command", function() {
       blockUnwantedPref.value = blockUncommonUnwanted.checked;
@@ -231,19 +223,14 @@ var gSecurityPane = {
 
     enableSafeBrowsing.checked = safeBrowsingPhishingPref.value && safeBrowsingMalwarePref.value;
     if (!enableSafeBrowsing.checked) {
-      if (blockDownloads) {
       blockDownloads.setAttribute("disabled", "true");
-      }
-
       blockUncommonUnwanted.setAttribute("disabled", "true");
     }
 
-    if (blockDownloads) {
     blockDownloads.checked = blockDownloadsPref.value;
     if (!blockDownloadsPref.value) {
       blockUncommonUnwanted.setAttribute("disabled", "true");
     }
-    }
 
     blockUncommonUnwanted.checked = blockUnwantedPref.value && blockUncommonPref.value;
   },

browser/components/preferences/in-content/security.xul

@@ -78,11 +78,9 @@
               label="&enableSafeBrowsing.label;"
               accesskey="&enableSafeBrowsing.accesskey;" />
     <vbox class="indent">
-#ifdef MOZILLA_OFFICIAL
       <checkbox id="blockDownloads"
                 label="&blockDownloads.label;"
                 accesskey="&blockDownloads.accesskey;" />
-#endif
       <checkbox id="blockUncommonUnwanted"
                 label="&blockUncommonAndUnwanted.label;"
                 accesskey="&blockUncommonAndUnwanted.accesskey;" />