Bug 497656: don't migrate passwords and offlineApps settings from sanitize-on-shutdown to CPD-dialog, since the dialog no longer has UI for controlling them, r=gavin

browser/base/content/browser.js

@@ -1590,6 +1590,9 @@ function initializeSanitizer()
         var clearOnShutdownBranch = prefService.getBranch("privacy.clearOnShutdown.");
         itemArray.forEach(function (name) {
           try {
+            // don't migrate password or offlineApps clearing in the CRH dialog since
+            // there's no UI for those anymore. They default to false. bug 497656
+            if (name != "passwords" && name != "offlineApps")
               cpdBranch.setBoolPref(name, itemBranch.getBoolPref(name));
             clearOnShutdownBranch.setBoolPref(name, itemBranch.getBoolPref(name));
           }