Bug 630634 - After uninstalling restartless add-on, empty add-on bar reappears on next restart (r=mossop, a=blocker)

browser/base/content/browser.js

@@ -8571,9 +8571,13 @@ let AddonsMgrListener = {
     this.lastAddonBarCount = this.getAddonBarItemCount();
   },
   onUninstalled: function(aAddon) {
-    if (this.lastAddonBarCount > 0 && this.getAddonBarItemCount() == 0)
+    if (this.getAddonBarItemCount() == 0)
       setToolbarVisibility(this.addonBar, false);
-  }
+  },
+  onEnabling: function(aAddon) this.onInstalling(),
+  onEnabled: function(aAddon) this.onInstalled(),
+  onDisabling: function(aAddon) this.onUninstalling(),
+  onDisabled: function(aAddon) this.onUninstalled(),
 };
 
 function toggleAddonBar() {

browser/base/content/test/Makefile.in

@@ -242,6 +242,7 @@ _BROWSER_FILES = \
                  browser_contentAreaClick.js \
                  browser_addon_bar_close_button.js \
                  browser_addon_bar_shortcut.js \
+                 browser_addon_bar_aomlistener.js \
                  $(NULL)
 
 # compartment-disabled

browser/base/content/test/browser_addon_bar_aomlistener.js

@@ -0,0 +1,99 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is browser add-on bar test code.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Dietrich Ayala <dietrich@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+function test() {
+
+  let addonbar = document.getElementById("addon-bar");
+  ok(addonbar.collapsed, "addon bar is collapsed by default");
+
+  function addItem(id) {
+    let button = document.createElement("toolbarbutton");
+    button.id = id;
+    let palette = document.getElementById("navigator-toolbox").palette;
+    palette.appendChild(button);
+    addonbar.insertItem(id, null, null, false);
+  }
+
+  // call onInstalling
+  AddonsMgrListener.onInstalling();
+
+  // add item to the bar
+  let id = "testbutton";
+  addItem(id);
+
+  // call onInstalled
+  AddonsMgrListener.onInstalled();
+
+  // confirm bar is visible
+  ok(!addonbar.collapsed, "addon bar is not collapsed after toggle");
+
+  // call onUninstalling
+  AddonsMgrListener.onUninstalling();
+
+  // remove item from the bar
+  addonbar.currentSet = addonbar.currentSet.replace("," + id, "");
+
+  // call onUninstalled
+  AddonsMgrListener.onUninstalled();
+
+  // confirm bar is not visible
+  ok(addonbar.collapsed, "addon bar is collapsed after toggle");
+
+  // call onEnabling
+  AddonsMgrListener.onEnabling();
+
+  // add item to the bar
+  let id = "testbutton";
+  addItem(id);
+
+  // call onEnabled
+  AddonsMgrListener.onEnabled();
+
+  // confirm bar is visible
+  ok(!addonbar.collapsed, "addon bar is not collapsed after toggle");
+
+  // call onDisabling
+  AddonsMgrListener.onDisabling();
+
+  // remove item from the bar
+  addonbar.currentSet = addonbar.currentSet.replace("," + id, "");
+
+  // call onDisabled
+  AddonsMgrListener.onDisabled();
+
+  // confirm bar is not visible
+  ok(addonbar.collapsed, "addon bar is collapsed after toggle");
+}