Bug 1864534 - remove firefox-view-next pref and update about AboutRedirector r=fxview-reviewers,Gijs

- removes about:firefoxview-next route
- about:firefoxview now points to firefoxview-next.html (until we rename)
- remove pref for browser.tabs.firefox-view-next
- preserve pref for browser.tabs.firefox-view-newIcon as part of firefoxViewNext feature manifest (until experiment is over)

Depends on D196080

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

Author: nikk15

browser/app/profile/firefox.js

@@ -908,7 +908,6 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", false);
 #endif
 
 pref("browser.tabs.firefox-view", true);
-pref("browser.tabs.firefox-view-next", true);
 pref("browser.tabs.firefox-view-newIcon", true);
 pref("browser.tabs.firefox-view.logLevel", "Warn");
 pref("browser.tabs.firefox-view.notify-for-tabs", false);

browser/base/content/browser.js

@@ -9968,7 +9968,6 @@ var FirefoxViewHandler = {
     this._updateEnabledState = this._updateEnabledState.bind(this);
     this._updateEnabledState();
     NimbusFeatures.majorRelease2022.onUpdate(this._updateEnabledState);
-    NimbusFeatures.firefoxViewNext.onUpdate(this._updateEnabledState);
 
     ChromeUtils.defineESModuleGetters(this, {
       SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
@@ -9979,12 +9978,9 @@ var FirefoxViewHandler = {
     CustomizableUI.removeListener(this);
     Services.obs.removeObserver(this, "firefoxview-notification-dot-update");
     NimbusFeatures.majorRelease2022.offUpdate(this._updateEnabledState);
-    NimbusFeatures.firefoxViewNext.offUpdate(this._updateEnabledState);
   },
   _updateEnabledState() {
-    this._enabled =
-      NimbusFeatures.majorRelease2022.getVariable("firefoxView") ||
-      NimbusFeatures.firefoxViewNext.getVariable("enabled");
+    this._enabled = NimbusFeatures.majorRelease2022.getVariable("firefoxView");
     // We use a root attribute because there's no guarantee the button is in the
     // DOM, and visibility changes need to take effect even if it isn't in the DOM
     // right now.
@@ -10019,9 +10015,7 @@ var FirefoxViewHandler = {
         CustomizableUI.getPlacementOfWidget("tabbrowser-tabs").position
       );
     }
-    const viewURL = NimbusFeatures.firefoxViewNext.getVariable("enabled")
-      ? "about:firefoxview-next"
-      : "about:firefoxview";
+    const viewURL = "about:firefoxview";
     // Need to account for navigation to Firefox View pages
     if (
       this.tab &&
@@ -10119,18 +10113,11 @@ var FirefoxViewHandler = {
       const PREF_NAME = "browser.firefox-view.view-count";
       const MAX_VIEW_COUNT = 10;
       let viewCount = Services.prefs.getIntPref(PREF_NAME, 0);
-      let isFirefoxViewNext = Services.prefs.getBoolPref(
-        "browser.tabs.firefox-view-next",
-        false
-      );
 
       // Record telemetry
-      Services.telemetry.setEventRecordingEnabled(
-        isFirefoxViewNext ? "firefoxview_next" : "firefoxview",
-        true
-      );
+      Services.telemetry.setEventRecordingEnabled("firefoxview_next", true);
       Services.telemetry.recordEvent(
-        isFirefoxViewNext ? "firefoxview_next" : "firefoxview",
+        "firefoxview_next",
         "tab_selected",
         "toolbarbutton",
         null,

browser/components/about/AboutRedirector.cpp

@@ -74,10 +74,7 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"firefoxview", "chrome://browser/content/firefoxview/firefoxview.html",
-     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
-         nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-    {"firefoxview-next",
+    {"firefoxview",
      "chrome://browser/content/firefoxview/firefoxview-next.html",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},

browser/components/firefoxview/tests/browser/FirefoxViewTestUtils.sys.mjs

@@ -18,9 +18,7 @@ function init(scope) {
 }
 
 function getFirefoxViewURL() {
-  return Services.prefs.getBoolPref("browser.tabs.firefox-view-next", true)
-    ? "about:firefoxview-next"
-    : "about:firefoxview";
+  return "about:firefoxview";
 }
 
 function assertFirefoxViewTab(win) {

browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_next.js

@@ -3,33 +3,9 @@
 
 /* import-globals-from ../head.js */
 
-const FXVIEW_NEXT_ENABLED_PREF = "browser.tabs.firefox-view-next";
 const FXVIEW_ENABLED_PREF = "browser.tabs.firefox-view";
 
-add_task(async function about_firefoxview_next_pref() {
-  // Verify pref enables new Firefox view
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_NEXT_ENABLED_PREF, true]] });
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    is(document.location.href, "about:firefoxview-next");
-  });
-  // Verify pref enables new Firefox view even when old is disabled
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_ENABLED_PREF, false]] });
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    is(document.location.href, "about:firefoxview-next");
-  });
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_ENABLED_PREF, true]] });
-  // Verify pref disables new Firefox view
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_NEXT_ENABLED_PREF, false]] });
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    is(document.location.href, "about:firefoxview");
-  });
-});
-
 add_task(async function test_aria_roles() {
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_NEXT_ENABLED_PREF, true]] });
   await withFirefoxView({}, async browser => {
     const { document } = browser.contentWindow;
     is(document.location.href, "about:firefoxview-next");
@@ -99,12 +75,6 @@ add_task(async function test_aria_roles() {
       "Focus should be on button element of the synced tabs empty state"
     );
   });
-  // Verify pref disables new Firefox view
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_NEXT_ENABLED_PREF, false]] });
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    is(document.location.href, "about:firefoxview");
-  });
 });
 
 add_task(async function firefoxview_next_icon() {

browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_next_general_telemetry.js

@@ -3,7 +3,6 @@
 
 /* import-globals-from ../head.js */
 
-const FXVIEW_NEXT_ENABLED_PREF = "browser.tabs.firefox-view-next";
 const CARD_COLLAPSED_EVENT = [
   ["firefoxview_next", "card_collapsed", "card_container", undefined],
 ];
@@ -26,7 +25,6 @@ let enteredTelemetry = [
 ];
 
 add_setup(async () => {
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_NEXT_ENABLED_PREF, true]] });
   registerCleanupFunction(async () => {
     await SpecialPowers.popPrefEnv();
     clearHistory();
@@ -152,7 +150,6 @@ add_task(async function test_change_page_telemetry() {
 });
 
 add_task(async function test_browser_context_menu_telemetry() {
-  await SpecialPowers.pushPrefEnv({ set: [[FXVIEW_NEXT_ENABLED_PREF, true]] });
   const menu = document.getElementById("contentAreaContextMenu");
   await withFirefoxView({}, async browser => {
     const { document } = browser.contentWindow;

browser/components/firefoxview/tests/browser/firefoxview-next/browser_history_firefoxview_next.js

@@ -18,7 +18,6 @@ const SHOW_ALL_HISTORY_EVENT = [
   ["firefoxview_next", "show_all_history", "tabs", undefined],
 ];
 
-const FXVIEW_NEXT_ENABLED_PREF = "browser.tabs.firefox-view-next";
 const NEVER_REMEMBER_HISTORY_PREF = "browser.privatebrowsing.autostart";
 const DAY_MS = 24 * 60 * 60 * 1000;
 const today = new Date();
@@ -146,10 +145,7 @@ async function addHistoryItems(dateAdded) {
 
 add_setup(async () => {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      [FXVIEW_NEXT_ENABLED_PREF, true],
-      ["browser.firefox-view.search.enabled", true],
-    ],
+    set: [["browser.firefox-view.search.enabled", true]],
   });
   registerCleanupFunction(async () => {
     await SpecialPowers.popPrefEnv();

browser/components/firefoxview/tests/browser/firefoxview-next/browser_recentlyclosed_firefoxview_next.js

@@ -9,7 +9,6 @@ ChromeUtils.defineESModuleGetters(globalThis, {
   SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
 });
 
-const FXVIEW_NEXT_ENABLED_PREF = "browser.tabs.firefox-view-next";
 const NEVER_REMEMBER_HISTORY_PREF = "browser.privatebrowsing.autostart";
 const SEARCH_ENABLED_PREF = "browser.firefox-view.search.enabled";
 const RECENTLY_CLOSED_EVENT = [
@@ -230,10 +229,7 @@ async function recentlyClosedDismissTelemetry() {
 
 add_setup(async () => {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      [FXVIEW_NEXT_ENABLED_PREF, true],
-      [SEARCH_ENABLED_PREF, true],
-    ],
+    set: [[SEARCH_ENABLED_PREF, true]],
   });
   registerCleanupFunction(async () => {
     await SpecialPowers.popPrefEnv();

browser/components/firefoxview/tests/browser/firefoxview-next/browser_syncedtabs_errors_firefoxview_next.js

@@ -41,7 +41,6 @@ add_setup(async function () {
 
   await SpecialPowers.pushPrefEnv({
     set: [
-      ["browser.tabs.firefox-view-next", true],
       ["services.sync.engine.tabs", true],
       ["identity.fxaccounts.enabled", true],
     ],

browser/components/firefoxview/tests/browser/firefoxview-next/browser_syncedtabs_firefoxview_next.js

@@ -15,9 +15,6 @@ add_setup(async function () {
   registerCleanupFunction(async function () {
     await tearDown(gSandbox);
   });
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.tabs.firefox-view-next", true]],
-  });
 });
 
 add_task(async function test_unconfigured_initial_state() {

toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_click_element.js

@@ -59,10 +59,7 @@ let sandbox;
 
 add_setup(async () => {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.tabs.firefox-view", true],
-      ["browser.tabs.firefox-view-next", false],
-    ],
+    set: [["browser.tabs.firefox-view", true]],
   });
 
   sandbox = sinon.createSandbox();

toolkit/components/nimbus/FeatureManifest.yaml

@@ -1887,10 +1887,6 @@ firefoxViewNext:
   hasExposure: false
   isEarlyStartup: true
   variables:
-    enabled:
-      type: boolean
-      fallbackPref: "browser.tabs.firefox-view-next"
-      description: "Whether or not to enable the new Firefox View"
     newIcon:
       type: boolean
       fallbackPref: "browser.tabs.firefox-view-newIcon"

toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs

@@ -235,7 +235,6 @@ const DEFAULT_ENVIRONMENT_PREFS = new Map([
   ["browser.startup.homepage", { what: RECORD_PREF_STATE }],
   ["browser.startup.page", { what: RECORD_PREF_VALUE }],
   ["browser.tabs.firefox-view", { what: RECORD_PREF_VALUE }],
-  ["browser.tabs.firefox-view-next", { what: RECORD_PREF_VALUE }],
   ["browser.urlbar.autoFill", { what: RECORD_DEFAULTPREF_VALUE }],
   [
     "browser.urlbar.autoFill.adaptiveHistory.enabled",