Bug 2036752: Use correct registry path for PreXULSkeletonUI in enterprise builds and allow skeleton UI when MOZ_BYPASS_FELT is set

Author: victhorlopez

browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js

@@ -2,6 +2,10 @@ ChromeUtils.defineESModuleGetters(this, {
   WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
 });
 
+const kRegPath = AppConstants.MOZ_ENTERPRISE
+  ? "Software\\Mozilla\\FirefoxEnterprise\\PreXULSkeletonUISettings"
+  : "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings";
+
 function getFirefoxExecutableFile() {
   let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
   file = Services.dirsvc.get("GreBinD", Ci.nsIFile);
@@ -56,15 +60,15 @@ add_task(async function testWritesEnabledOnPrefChange() {
   const firefoxPath = getFirefoxExecutableFile().path;
   let enabled = WindowsRegistry.readRegKey(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    kRegPath,
     `${firefoxPath}|Enabled`
   );
   is(enabled, 1, "Pre-XUL skeleton UI is enabled in the Windows registry");
 
   Services.prefs.setBoolPref("browser.startup.preXulSkeletonUI", false);
   enabled = WindowsRegistry.readRegKey(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    kRegPath,
     `${firefoxPath}|Enabled`
   );
   is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
@@ -73,7 +77,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
   Services.prefs.setIntPref("browser.tabs.inTitlebar", 0);
   enabled = WindowsRegistry.readRegKey(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    kRegPath,
     `${firefoxPath}|Enabled`
   );
   is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
@@ -106,7 +110,7 @@ add_task(async function testPersistsNecessaryValuesOnChange() {
   for (let key of regKeys) {
     WindowsRegistry.removeRegKey(
       Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+      kRegPath,
       key
     );
   }
@@ -116,7 +120,7 @@ add_task(async function testPersistsNecessaryValuesOnChange() {
   for (let key of regKeys) {
     let value = readRegKeyExtended(
       Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+      kRegPath,
       `${firefoxPath}|${key}`
     );
     isnot(

mozglue/misc/PreXULSkeletonUI.cpp

@@ -1663,7 +1663,7 @@ static Result<Ok, PreXULSkeletonUIError> ValidateCmdlineArguments(
   // PreXULSkeletonUI is kept for normal browser, just disabled for FELT
   // window.
 #if defined(MOZ_ENTERPRISE)
-  if (!hasFeltFlag) {
+  if (!hasFeltFlag && !EnvHasValue("MOZ_BYPASS_FELT")) {
     return Err(PreXULSkeletonUIError::Cmdline);
   }
 #endif