Bug 1883140 - don't hide bookmarks in Felt Privacy mode. r=cmkm

Differential Revision: https://phabricator.services.mozilla.com/D203475

Author: DJ

browser/app/profile/firefox.js

@@ -2493,8 +2493,6 @@ pref("browser.toolbars.bookmarks.showOtherBookmarks", true);
 
 // Felt Privacy pref to control simplified private browsing UI
 pref("browser.privatebrowsing.felt-privacy-v1", false);
-// Visiblity of the bookmarks toolbar in PBM (currently only applies if felt-privacy-v1 is true)
-pref("browser.toolbars.bookmarks.showInPrivateBrowsing", false);
 
 // Prefs to control the Firefox Account toolbar menu.
 // This pref will surface existing Firefox Account information

browser/base/content/browser.js

@@ -526,13 +526,6 @@ XPCOMUtils.defineLazyPreferenceGetter(
   "newtab"
 );
 
-XPCOMUtils.defineLazyPreferenceGetter(
-  this,
-  "gBookmarksToolbarShowInPrivate",
-  "browser.toolbars.bookmarks.showInPrivateBrowsing",
-  false
-);
-
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
   "gFxaToolbarEnabled",
@@ -744,22 +737,13 @@ function browserWindows() {
 }
 
 function updateBookmarkToolbarVisibility() {
-  // Bug 1846583 - hide bookmarks toolbar in PBM
-  if (
-    gUseFeltPrivacyUI &&
-    !gBookmarksToolbarShowInPrivate &&
-    PrivateBrowsingUtils.isWindowPrivate(window)
-  ) {
-    setToolbarVisibility(BookmarkingUI.toolbar, false, false, false);
-  } else {
-    BookmarkingUI.updateEmptyToolbarMessage();
-    setToolbarVisibility(
-      BookmarkingUI.toolbar,
-      gBookmarksToolbarVisibility,
-      false,
-      false
-    );
-  }
+  BookmarkingUI.updateEmptyToolbarMessage();
+  setToolbarVisibility(
+    BookmarkingUI.toolbar,
+    gBookmarksToolbarVisibility,
+    false,
+    false
+  );
 }
 
 // This is a stringbundle-like interface to gBrowserBundle, formerly a getter for

browser/base/content/test/privateBrowsing/browser_private_browsing_simplified_ui.js

@@ -29,20 +29,5 @@ add_task(async function check_for_simplified_pbm_ui() {
     "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);
 });