Bug 1289151 - Remove obsolete nsIWalletService related code. r=jcj draft
authorCykesiopka <cykesiopka.bmo@gmail.com>
Wed, 27 Jul 2016 01:53:20 +0800
changeset 393011 bcfc05aeb58cdc214adcb4b1374d19aaf3b9054c
parent 392914 4ee7de4773864485b468f6178b4634c7f06ce077
child 526455 40c62b8b7f3331b12cb23f05d61a7bf1ba7434d8
push id24171
push usercykesiopka.bmo@gmail.com
push dateTue, 26 Jul 2016 17:54:04 +0000
reviewersjcj
bugs1289151
milestone50.0a1
Bug 1289151 - Remove obsolete nsIWalletService related code. r=jcj It appears the wallet code was not included during the initial 2007 import of code from CVS to Mercurial, so anything referencing wallet has been dead code ever since. MozReview-Commit-ID: BRTd1M0DsT0
security/manager/pki/resources/content/resetpassword.js
--- a/security/manager/pki/resources/content/resetpassword.js
+++ b/security/manager/pki/resources/content/resetpassword.js
@@ -28,33 +28,16 @@ function resetPassword()
 
   try {
     var loginManager = Components.classes["@mozilla.org/login-manager;1"].
                        getService(Components.interfaces.nsILoginManager);
     loginManager.removeAllLogins();
   } catch (e) {
   }
 
-  var pref = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService);
-  if (pref) {
-    pref = pref.getBranch(null);
-    try {
-      if (pref.getBoolPref("wallet.crypto")) {
-        // data in wallet is encrypted, clear it
-        var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
-        if (wallet) {
-          wallet = wallet.getService(Components.interfaces.nsIWalletService);
-          wallet.WALLET_DeleteAll();
-        }
-      }
-    } catch (e) {
-      // wallet.crypto pref is missing
-    }
-  }
-
   var bundle = document.getElementById("pippki_bundle");
   var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
   promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
   if (promptService && bundle) {
     promptService.alert(window,
                         bundle.getString("resetPasswordConfirmationTitle"),
                         bundle.getString("resetPasswordConfirmationMessage"));
   }