From 33e28b3002ba49cfb0dcb6c245725a36be8503e0 Mon Sep 17 00:00:00 2001
From: Cosmin Sabou <csabou@mozilla.com>
Date: Thu, 3 Feb 2022 08:42:46 +0200
Subject: [PATCH] Backed out changeset e00a268f35f3 (bug 1564738) for causing
 Bug 1753106 as requested by emk.

---
 browser/base/content/tabbrowser.js            |  3 +-
 browser/base/content/test/tabs/browser.ini    |  1 -
 .../test/tabs/browser_tabbar_visibility.js    | 45 -------------------
 3 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 browser/base/content/test/tabs/browser_tabbar_visibility.js

diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
index 44484bdc78b1..6bad6aadd601 100644
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -3070,11 +3070,10 @@
         this.removeTab(leftoverTab);
       }
 
-      TabBarVisibility.update();
-
       if (tabs.length > 1 || !tabs[0].selected) {
         this._updateTabsAfterInsert();
         this.tabContainer._setPositionalAttributes();
+        TabBarVisibility.update();
 
         for (let tab of tabs) {
           // If tabToSelect is a tab, we didn't reuse the selected tab.
diff --git a/browser/base/content/test/tabs/browser.ini b/browser/base/content/test/tabs/browser.ini
index 411d646a2191..648dbd35d7eb 100644
--- a/browser/base/content/test/tabs/browser.ini
+++ b/browser/base/content/test/tabs/browser.ini
@@ -124,7 +124,6 @@ skip-if =
 [browser_tab_manager_visibility.js]
 [browser_tab_move_to_new_window_reload.js]
 [browser_tabCloseProbes.js]
-[browser_tabbar_visibility.js]
 [browser_tabContextMenu_keyboard.js]
 [browser_tabReorder_overflow.js]
 [browser_tabReorder.js]
diff --git a/browser/base/content/test/tabs/browser_tabbar_visibility.js b/browser/base/content/test/tabs/browser_tabbar_visibility.js
deleted file mode 100644
index 1111e14cc4a0..000000000000
--- a/browser/base/content/test/tabs/browser_tabbar_visibility.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const { PromiseTestUtils } = ChromeUtils.import(
-  "resource://testing-common/PromiseTestUtils.jsm"
-);
-
-add_task(async function testWindowOpen() {
-  const DUMMY_PAGE = "browser/base/content/test/tabs/dummy_page.html";
-  const TEST_URL = "http://example.com/browser/" + DUMMY_PAGE;
-  const TEST_URL_CHROME = "chrome://mochitests/content/browser/" + DUMMY_PAGE;
-
-  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_URL_CHROME);
-  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-
-  PromiseTestUtils.expectUncaughtRejection(/editor is null/); // bug 1752901
-  let newWindowPromise = BrowserTestUtils.waitForNewWindow({
-    url: TEST_URL,
-  });
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [TEST_URL], url => {
-    content.eval(`window.open("${url}", "_blank", "menubar=0")`);
-  });
-  let win = await newWindowPromise;
-
-  is(win.toolbar.visible, false, "toolbar should be hidden");
-  let toolbar = win.document.getElementById("TabsToolbar");
-  is(toolbar.collapsed, true, "tabbar should be collapsed");
-
-  await BrowserTestUtils.closeWindow(win);
-
-  PromiseTestUtils.expectUncaughtRejection(/editor is null/); // bug 1752901
-  newWindowPromise = BrowserTestUtils.waitForNewWindow({
-    url: TEST_URL,
-  });
-  SessionStore.undoCloseWindow(0);
-  win = await newWindowPromise;
-
-  is(win.toolbar.visible, false, "toolbar should be hidden");
-  toolbar = win.document.getElementById("TabsToolbar");
-  is(toolbar.collapsed, true, "tabbar should be collapsed");
-
-  await BrowserTestUtils.closeWindow(win);
-});