Bug 1244908 - Remove privacy.clearOnShutdown.passwords migration code. r=dolske
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Wed, 03 Feb 2016 15:26:14 -0800
changeset 319176 b18bd2edd96ce2f07aebadbd11f0f833effba74f
parent 319175 7b81b08f1899ccbe80e5146c8cbd00625c110f4a
child 319177 9a7df8d26b39258ee77407f7a9d8d2ebac35e28b
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs1244908
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1244908 - Remove privacy.clearOnShutdown.passwords migration code. r=dolske
browser/app/profile/firefox.js
browser/base/content/sanitize.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -524,18 +524,16 @@ pref("privacy.cpd.openWindows",         
 // 4 - Today
 // 5 - Last 5 minutes
 // 6 - Last 24 hours
 pref("privacy.sanitize.timeSpan", 1);
 pref("privacy.sanitize.sanitizeOnShutdown", false);
 
 pref("privacy.sanitize.migrateFx3Prefs",    false);
 
-pref("privacy.sanitize.migrateClearSavedPwdsOnExit", false);
-
 pref("privacy.panicButton.enabled",         true);
 
 pref("network.proxy.share_proxy_settings",  false); // use the same proxy settings for all protocols
 
 // simple gestures support
 pref("browser.gesture.swipe.left", "Browser:BackOrBackDuplicate");
 pref("browser.gesture.swipe.right", "Browser:ForwardOrForwardDuplicate");
 pref("browser.gesture.swipe.up", "cmd_scrollTop");
--- a/browser/base/content/sanitize.js
+++ b/browser/base/content/sanitize.js
@@ -687,30 +687,16 @@ Sanitizer.onStartup = Task.async(functio
   let shutdownClient = Cc["@mozilla.org/browser/nav-history-service;1"]
      .getService(Ci.nsPIPlacesDatabase)
      .shutdownClient
      .jsclient;
 
   shutdownClient.addBlocker("sanitize.js: Sanitize on shutdown",
     () => Sanitizer.onShutdown());
 
-    // One time migration to remove support for the clear saved passwords on exit feature.
-    if (!Services.prefs.getBoolPref("privacy.sanitize.migrateClearSavedPwdsOnExit")) {
-      let deprecatedPref = "privacy.clearOnShutdown.passwords";
-      let doUpdate = Services.prefs.getBoolPref("privacy.sanitize.sanitizeOnShutdown") &&
-                     Services.prefs.prefHasUserValue(deprecatedPref) &&
-                     Services.prefs.getBoolPref(deprecatedPref);
-      if (doUpdate) {
-        Services.logins.removeAllLogins();
-        Services.prefs.setBoolPref("signon.rememberSignons", false);
-      }
-      Services.prefs.clearUserPref(deprecatedPref);
-      Services.prefs.setBoolPref("privacy.sanitize.migrateClearSavedPwdsOnExit", true);
-  }
-
   // Handle incomplete sanitizations
   if (Preferences.has(Sanitizer.PREF_SANITIZE_IN_PROGRESS)) {
     // Firefox crashed during sanitization.
     let s = new Sanitizer();
     let json = Preferences.get(Sanitizer.PREF_SANITIZE_IN_PROGRESS);
     let itemsToClear = JSON.parse(json);
     yield s.sanitize(itemsToClear);
   }