Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 51 insertions, 0 deletions

diff --git a/browser/base/content/test/privateBrowsing/browser.toml b/browser/base/content/test/privateBrowsing/browser.toml
new file mode 100644
index 0000000000..4750e8de69
--- /dev/null
+++ b/browser/base/content/test/privateBrowsing/browser.toml
@@ -0,0 +1,3 @@
+[DEFAULT]
+
+["browser_private_browsing_simplified_ui.js"]
diff --git a/browser/base/content/test/privateBrowsing/browser_private_browsing_simplified_ui.js b/browser/base/content/test/privateBrowsing/browser_private_browsing_simplified_ui.js
new file mode 100644
index 0000000000..162bf7ab5a
--- /dev/null
+++ b/browser/base/content/test/privateBrowsing/browser_private_browsing_simplified_ui.js
@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.privatebrowsing.felt-privacy-v1", true]],
+  });
+});
+
+add_task(async function check_for_simplified_pbm_ui() {
+  let pbmWindow = await BrowserTestUtils.openNewBrowserWindow({
+    private: true,
+  });
+
+  let pocketButton = pbmWindow.document.getElementById("save-to-pocket-button");
+  ok(!pocketButton, "Pocket button is removed from PBM window");
+  let bookmarksBar = pbmWindow.document.getElementById("PersonalToolbar");
+  ok(
+    bookmarksBar.getAttribute("collapsed"),
+    "Bookmarks bar is hidden in PBM window"
+  );
+
+  await BrowserTestUtils.openNewForegroundTab(pbmWindow, "about:blank", true);
+  ok(
+    bookmarksBar.getAttribute("collapsed"),
+    "Bookmarks bar is hidden in PBM window after loading a new tab"
+  );
+
+  await BrowserTestUtils.closeWindow(pbmWindow);
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.toolbars.bookmarks.showInPrivateBrowsing", true]],
+  });
+  pbmWindow = await BrowserTestUtils.openNewBrowserWindow({
+    private: true,
+  });
+  bookmarksBar = pbmWindow.document.getElementById("PersonalToolbar");
+  console.info(bookmarksBar.getAttribute("collapsed"));
+  Assert.equal(
+    bookmarksBar.getAttribute("collapsed").toString(),
+    "false",
+    "Bookmarks bar is visible in PBM window when showInPrivateBrowsing pref is true"
+  );
+
+  await BrowserTestUtils.closeWindow(pbmWindow);
+});