Make "Log Out" clear all HTTP auth sessions as well as expiring the master password b=55181 p=vhaarr@firefox.no r=me sr=darin

extensions/wallet/resources/content/walletTasksOverlay.xul

@@ -45,11 +45,17 @@
   <script type="application/x-javascript">
   <![CDATA[
 
-    // expire master password
+    // First clears the HTTP auth, then the Wallet
-    function walletPasswordExpire() {
+    function expireHTTPAuthAndWallet() {
-      var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
+      // Queries the HTTP Auth Manager and clears all sessions
-      wallet = wallet.getService();
+      Components.classes['@mozilla.org/network/http-auth-manager;1']
-      wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
+                .getService(Components.interfaces.nsIHttpAuthManager)
+                .clearAll();
+
+      // Expires the master password
+      var wallet =
+        Components.classes['@mozilla.org/wallet/wallet-service;1']
+                  .getService(Components.interfaces.nsIWalletService);
       var strings = document.getElementById("menu_passwordManager");
 
       if (wallet.WALLET_ExpirePassword()) {
@@ -79,7 +85,7 @@
       <menupopup>
         <menuitem label="&walletExpirePasswordCmd.label;"
                   accesskey="&walletExpirePasswordCmd.accesskey;"
-                  oncommand="walletPasswordExpire();"/>
+                  oncommand="expireHTTPAuthAndWallet();"/>
         <menuitem label="&walletDisplaySignonsCmd.label;"
                   accesskey="&walletDisplaySignonsCmd.accesskey;"
                   oncommand="walletPasswordDialog();"/>