chore: Added better testing preferences and cleaned up a bit, b=(no-bug), c=common, tests, workspaces

src/browser/app/profile/zen-browser.js

@@ -198,7 +198,6 @@ pref('zen.splitView.rearrange-hover-size', 24);
 pref('zen.startup.smooth-scroll-in-tabs', true);
 
 // Zen Workspaces
-pref('zen.workspaces.disabled_for_testing', false);
 pref('zen.workspaces.hide-default-container-indicator', true);
 pref('zen.workspaces.force-container-workspace', false);
 pref('zen.workspaces.open-new-tab-if-last-unpinned-tab-is-closed', false);
@@ -335,10 +334,6 @@ pref("network.predictor.enable-hover-on-ssl", true);
 pref("network.http.speculative-parallel-limit", 10);
 pref("network.http.rcwn.enabled", false);
 
-// Enable Browser Toolbox, Ctrl+Shift+Alt+I for debugging and modifying UI
-pref("devtools.debugger.remote-enabled", false);
-pref("devtools.chrome.enabled", true);
-
 // Disable Firefox's revamp
 pref("sidebar.revamp", false, locked);
 pref("sidebar.verticalTabs", false, locked);
@@ -454,10 +449,6 @@ pref("browser.ml.chat.sidebar", false);
 pref("browser.ml.enable", false);
 
 // ---- Experimental settings to try make zen faster
-pref("gfx.canvas.accelerated.cache-items", 32768);
-pref("gfx.canvas.accelerated.cache-size", 256);
-pref("gfx.content.skia-font-cache-size", 80);
-
 pref("media.memory_cache_max_size", 1048576);
 pref("media.cache_readahead_limit", 9000);
 pref("media.cache_resume_threshold", 3600);

src/browser/base/content/nsContextMenu-sys-mjs.patch

@@ -1,16 +1,11 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 3bd0ee8af8b696161d18fd2a978f9e25972ed3ad..2f0763dbde2250f625e9a87ab88910b4421c36ca 100644
+index 3bd0ee8af8b696161d18fd2a978f9e25972ed3ad..9e602a942271bd54231dc66363f8db51aea9e78a 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1111,6 +1111,13 @@ export class nsContextMenu {
+@@ -1111,6 +1111,8 @@ export class nsContextMenu {
          !this.isSecureAboutPage()
      );
  
-+    this.showItem(
-+      "context-zenAddToWebPanel",
-+      this.onLink && !this.onMailtoLink && !this.onTelLink
-+    );
-+
 +    this.showItem("context-zenSplitLink", this.onLink && !this.onMailtoLink && !this.onTelLink);
 +
      let canNotStrip =

src/browser/base/content/zen-assets.inc.xhtml

@@ -29,11 +29,11 @@
 
 # Scripts used all over the browser
 <script>
+Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs", this);
 Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenFolders.mjs", this);
 Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesCommon.mjs", this);
 Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesImporter.mjs", this);
 Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCompactMode.mjs", this);
-Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs", this);
 Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenTabUnloader.mjs", this);
 Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs", this);
 Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs", this);

src/browser/components/tabbrowser/content/tabbrowser-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 6dece2b9d0462d90a28e75350ce983d87816ef73..b1f6a5e05281cdc9707f4e82fe3df611d246cc6f 100644
+index 6dece2b9d0462d90a28e75350ce983d87816ef73..e80730ed2db404c0d47f2e29c3235c66f0137ad2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -415,11 +415,58 @@
@@ -67,7 +67,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..b1f6a5e05281cdc9707f4e82fe3df611
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
-+      ZenWorkspaces.handleInitialTab(tab, (!remoteType || remoteType === E10SUtils.PRIVILEGEDABOUT_REMOTE_TYPE) && !Services.prefs.getBoolPref('zen.workspaces.disable_empty_state_for_testing', false));
++      ZenWorkspaces.handleInitialTab(tab, (!remoteType || remoteType === E10SUtils.PRIVILEGEDABOUT_REMOTE_TYPE) && !gZenUIManager.testingEnabled);
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;

src/browser/themes/shared/zen-icons/icons.css

@@ -59,9 +59,7 @@
   list-style-image: url('sidebars-right.svg') !important;
 }
 
-#context_zenSplitTabs,
-#context-zenAddToWebPanel {
-  /* TODO: Add split view icon */
+#context_zenSplitTabs {
   --menu-image: url('sidebars-right.svg') !important;
 }
 

src/testing/profiles/mochitest/user-js.patch

@@ -1,16 +1,14 @@
 diff --git a/testing/profiles/mochitest/user.js b/testing/profiles/mochitest/user.js
-index a4068ac3f61161d014c49d54ae7a3bf886868f1b..84523e9e10d44269172aa6913699ec50def8166e 100644
+index a4068ac3f61161d014c49d54ae7a3bf886868f1b..b9861cfaae19a4a71b75ccc73095dc602df22b12 100644
 --- a/testing/profiles/mochitest/user.js
 +++ b/testing/profiles/mochitest/user.js
-@@ -41,3 +41,11 @@ user_pref("places.history.floodingPrevention.enabled", false);
+@@ -41,3 +41,9 @@ user_pref("places.history.floodingPrevention.enabled", false);
  // permission, and we can open it and wait for the user to give permission, then
  // don't do that.
  user_pref("geo.prompt.open_system_prefs", false);
 +
-+user_pref("zen.keyboard.shortcuts.enabled", false);
 +user_pref("zen.welcome-screen.seen", true);
 +user_pref("zen.tab-unloader.enabled", false);
-+user_pref("zen.workspaces.disable_empty_state_for_testing", true);
 +user_pref("zen.watermark.enabled", false);
 +user_pref("zen.urlbar.replace-newtab", false);
-+user_pref("zen.sidebar.use-google-favicons", false); // Crashes on some platforms
++user_pref("zen.testing.enabled", true);

src/testing/profiles/profileserver/user-js.patch

@@ -1,17 +1,16 @@
 diff --git a/testing/profiles/profileserver/user.js b/testing/profiles/profileserver/user.js
-index 19ff7d474f6d22d2d386764e2e6942ce6a324470..a1ed4b51f26f458f965fbc29dfa7b8ad451faf7f 100644
+index 19ff7d474f6d22d2d386764e2e6942ce6a324470..a68a1f692e050c2a2a7e5e1390dec9556e71d7ed 100644
 --- a/testing/profiles/profileserver/user.js
 +++ b/testing/profiles/profileserver/user.js
-@@ -8,3 +8,12 @@
+@@ -8,3 +8,11 @@
  user_pref("dom.timeout.enable_budget_timer_throttling", false);
  // Turn off update
  user_pref("app.update.disabledForTesting", true);
 +
 +// zen:
 +// Disable some of zen's features to better match the default Firefox experience
-+user_pref("zen.workspaces.disabled_for_testing", true);
-+user_pref("zen.workspaces.disable_empty_state_for_testing", true);
 +user_pref("zen.welcome-screen.seen", true);
 +user_pref("zen.tab-unloader.enabled", false);
 +user_pref("zen.watermark.enabled", false);
-+user_pref("zen.glance.enabled", false);
++user_pref("zen.urlbar.replace-newtab", false);
++user_pref("zen.testing.enabled", true);

src/zen/common/ZenUIManager.mjs

@@ -2,6 +2,7 @@ var gZenUIManager = {
   _popupTrackingElements: [],
   _hoverPausedForExpand: false,
   _hasLoadedDOM: false,
+  testingEnabled: Services.prefs.getBoolPref('zen.testing.enabled', false),
 
   init() {
     document.addEventListener('popupshowing', this.onPopupShowing.bind(this));
@@ -254,6 +255,10 @@ var gZenUIManager = {
       return false;
     }
 
+    if (this.testingEnabled) {
+      return false;
+    }
+
     const shouldOpenURLBar = gZenVerticalTabsManager._canReplaceNewTab && !werePassedURL && !searchClipboard && where === 'tab';
 
     if (!shouldOpenURLBar) {
@@ -630,7 +635,7 @@ var gZenVerticalTabsManager = {
   },
 
   _updateEvent({ forCustomizableMode = false, dontRebuildAreas = false } = {}) {
-    if (this._isUpdating) {
+    if (this._isUpdating || gZenUIManager.testingEnabled) {
       return;
     }
     this._isUpdating = true;

src/zen/tests/run.sh

@@ -6,10 +6,6 @@ if [ ! -f "package.json" ]; then
   exit 1
 fi
 
-rm -rf engine/browser/base/zen-components/tests/
-
-npm run import
-npm run build:ui
 cd ./engine
-./mach mochitest browser/base/zen-components/tests
+./mach mochitest zen/tests/ $@
 cd ..

src/zen/workspaces/ZenWorkspaces.mjs

@@ -266,7 +266,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   _initializeEmptyTab() {
-    if (Services.prefs.getBoolPref('zen.workspaces.disable_empty_state_for_testing', false)) {
+    if (gZenUIManager.testingEnabled) {
       return;
     }
     this._emptyTab = gBrowser.addTrustedTab('about:blank', { inBackground: true, userContextId: 0, _forZenEmptyTab: true });
@@ -678,8 +678,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   get workspaceEnabled() {
     if (typeof this._workspaceEnabled === 'undefined') {
-      this._workspaceEnabled =
-        !Services.prefs.getBoolPref('zen.workspaces.disabled_for_testing', false) && this.shouldHaveWorkspaces;
+      this._workspaceEnabled = !gZenUIManager.testingEnabled && this.shouldHaveWorkspaces;
     }
     return this._workspaceEnabled && !window.closed;
   }
@@ -769,7 +768,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   async _selectStartPage() {
-    if (Services.prefs.getBoolPref('zen.workspaces.disable_empty_state_for_testing', false)) {
+    if (gZenUIManager.testingEnabled) {
       return;
     }
     if (this._initialTab) {