Backed out 2 changesets (bug 1869605, bug 1864534) for bc failures on browser_all_files_referenced.js.

Backed out changeset 576e61e3970b (bug 1864534)
Backed out changeset 05b09125b90b (bug 1869605)

Author: CosminSabou

browser/app/profile/firefox.js

@@ -908,6 +908,7 @@ 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,6 +9968,7 @@ 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",
@@ -9978,9 +9979,12 @@ 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");
+    this._enabled =
+      NimbusFeatures.majorRelease2022.getVariable("firefoxView") ||
+      NimbusFeatures.firefoxViewNext.getVariable("enabled");
     // 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.
@@ -10015,7 +10019,9 @@ var FirefoxViewHandler = {
         CustomizableUI.getPlacementOfWidget("tabbrowser-tabs").position
       );
     }
-    const viewURL = "about:firefoxview";
+    const viewURL = NimbusFeatures.firefoxViewNext.getVariable("enabled")
+      ? "about:firefoxview-next"
+      : "about:firefoxview";
     // Need to account for navigation to Firefox View pages
     if (
       this.tab &&
@@ -10113,11 +10119,18 @@ 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("firefoxview_next", true);
+      Services.telemetry.setEventRecordingEnabled(
+        isFirefoxViewNext ? "firefoxview_next" : "firefoxview",
+        true
+      );
       Services.telemetry.recordEvent(
-        "firefoxview_next",
+        isFirefoxViewNext ? "firefoxview_next" : "firefoxview",
         "tab_selected",
         "toolbarbutton",
         null,

browser/components/about/AboutRedirector.cpp

@@ -74,7 +74,10 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"firefoxview",
+    {"firefoxview", "chrome://browser/content/firefoxview/firefoxview.html",
+     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
+         nsIAboutModule::HIDE_FROM_ABOUTABOUT},
+    {"firefoxview-next",
      "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,7 +18,9 @@ function init(scope) {
 }
 
 function getFirefoxViewURL() {
-  return "about:firefoxview";
+  return Services.prefs.getBoolPref("browser.tabs.firefox-view-next", true)
+    ? "about:firefoxview-next"
+    : "about:firefoxview";
 }
 
 function assertFirefoxViewTab(win) {

browser/components/firefoxview/tests/browser/browser.toml

@@ -1,6 +1,7 @@
 [DEFAULT]
 support-files = ["head.js"]
 prefs = [
+  "browser.tabs.firefox-view-next=false",
   "browser.sessionstore.closedTabsFromAllWindows=true",
   "browser.sessionstore.closedTabsFromClosedWindows=true",
   "browser.tabs.firefox-view.logLevel=All",
@@ -23,13 +24,47 @@ skip-if = ["os == 'linux'"] # Bug 1784343
 
 ["browser_firefoxview.js"]
 
+["browser_firefoxview_accessibility.js"]
+
 ["browser_firefoxview_tab.js"]
 
+["browser_keyboard_focus.js"]
+
 ["browser_notification_dot.js"]
 skip-if = ["true"] # Bug 1851453
 
+["browser_recently_closed_tabs.js"]
+fail-if = ["a11y_checks"] # Bug 1854625 clicked a.closed-tab-li-title may not be focusable
+
+["browser_recently_closed_tabs_keyboard.js"]
+
+["browser_recently_closed_tabs_windows.js"]
+fail-if = ["a11y_checks"] # Bug 1854625 clicked a.closed-tab-li-title may not be focusable
+
 ["browser_reload_firefoxview.js"]
 
+["browser_setup_errors.js"]
+
+["browser_setup_primary_password.js"]
+
+["browser_setup_state.js"]
+
+["browser_setup_synced_tabs_loading.js"]
+
+["browser_sync_admin_disabled.js"]
+
 ["browser_tab_close_last_tab.js"]
 
 ["browser_tab_on_close_warning.js"]
+
+["browser_tab_pickup_device_added_telemetry.js"]
+
+["browser_tab_pickup_list.js"]
+skip-if = [
+  "os == 'linux'",  # Bug 1824273
+  "os == 'win'",  # Bug 1824273
+]
+
+["browser_tab_pickup_visibility.js"]
+
+["browser_ui_state.js"]

browser/components/firefoxview/tests/browser/browser_firefoxview.js

@@ -2,14 +2,22 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 add_task(async function about_firefoxview_smoke_test() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.tabs.firefox-view-next", false]],
+  });
+
   await withFirefoxView({}, async browser => {
     const { document } = browser.contentWindow;
 
     // sanity check the important regions exist on this page
     ok(
-      document.querySelector("fxview-category-navigation"),
-      "fxview-category-navigation element exists"
+      document.getElementById("tab-pickup-container"),
+      "tab-pickup-container element exists"
+    );
+    ok(
+      document.getElementById("recently-closed-tabs-container"),
+      "recently-closed-tabs-container element exists"
     );
-    ok(document.querySelector("named-deck"), "named-deck element exists");
   });
+  await SpecialPowers.popPrefEnv();
 });

browser/components/firefoxview/tests/browser/browser_firefoxview_accessibility.js

@@ -0,0 +1,102 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Tests that are related to the accessibility of the Firefox View
+ * document. These tasks tend to be privileged content, not browser
+ * chrome.
+ */
+
+add_setup(async function setup() {
+  // Make sure the prompt to connect FxA doesn't show
+  // Without resetting the view-count pref it gets surfaced after
+  // the third click on the fx view toolbar button.
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.firefox-view.view-count", 0],
+      ["browser.tabs.firefox-view-next", false],
+    ],
+  });
+  registerCleanupFunction(async () => {
+    await SpecialPowers.popPrefEnv();
+  });
+});
+
+add_task(async function test_keyboard_focus_after_tab_pickup_opened() {
+  // Reset various things touched by other tests in this file so that
+  // we have a sufficiently clean environment.
+
+  TabsSetupFlowManager.resetInternalState();
+
+  // Ensure that the tab-pickup section doesn't need to be opened.
+  Services.prefs.clearUserPref(
+    "browser.tabs.firefox-view.ui-state.tab-pickup.open"
+  );
+
+  // Let's be deterministic about the basic UI state!
+  const sandbox = setupMocks({
+    state: UIState.STATUS_NOT_CONFIGURED,
+    syncEnabled: false,
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    let win = browser.ownerGlobal;
+
+    is(
+      document.activeElement.localName,
+      "body",
+      "document body element is initially focused"
+    );
+
+    const tab = () => {
+      info("Tab keypress synthesized");
+      EventUtils.synthesizeKey("KEY_Tab", {}, win);
+    };
+
+    tab();
+
+    let tabPickupContainer = document.querySelector(
+      "#tab-pickup-container summary.page-section-header"
+    );
+    is(
+      document.activeElement,
+      tabPickupContainer,
+      "tab pickup container header has focus"
+    );
+
+    tab();
+
+    is(
+      document.activeElement.id,
+      "firefoxview-tabpickup-step-signin-primarybutton",
+      "tab pickup primary button has focus"
+    );
+  });
+
+  // cleanup time
+  await tearDown(sandbox);
+});
+
+add_task(async function test_keyboard_accessibility_tab_pickup() {
+  await withFirefoxView({}, async browser => {
+    const win = browser.ownerGlobal;
+    const { document } = browser.contentWindow;
+    const enter = async () => {
+      info("Enter");
+      EventUtils.synthesizeKey("KEY_Enter", {}, win);
+    };
+    let details = document.getElementById("tab-pickup-container");
+    let summary = details.querySelector("summary");
+    ok(summary, "summary element should exist");
+    ok(details.open, "Tab pickup container should be initially open on load");
+    summary.focus();
+    await enter();
+    ok(!details.open, "Tab pickup container should be closed");
+    await enter();
+    ok(details.open, "Tab pickup container should be opened");
+  });
+  cleanup_tab_pickup();
+});

browser/components/firefoxview/tests/browser/browser_keyboard_focus.js

@@ -0,0 +1,91 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+ChromeUtils.defineESModuleGetters(globalThis, {
+  SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
+});
+
+const SYNCED_URI = syncedTabsData1[0].tabs[1].url;
+
+add_task(async function test_keyboard_focus() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["accessibility.tabfocus", 7]],
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+
+    const sandbox = setupRecentDeviceListMocks();
+    const syncedTabsMock = sandbox.stub(SyncedTabs, "getRecentTabs");
+    let mockTabs1 = getMockTabData(syncedTabsData1);
+    syncedTabsMock.returns(mockTabs1);
+
+    await setupListState(browser);
+
+    testVisibility(browser, {
+      expectedVisible: {
+        "ol.synced-tabs-list": true,
+      },
+    });
+
+    let tabPickupEle = document.querySelector(".synced-tab-a");
+    document.querySelector(".page-section-header").focus();
+
+    EventUtils.synthesizeKey("KEY_Tab");
+
+    is(
+      tabPickupEle,
+      document.activeElement,
+      "The first tab pickup link is focused"
+    );
+
+    let newTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, SYNCED_URI);
+    EventUtils.synthesizeKey("KEY_Enter");
+    await newTabPromise;
+
+    is(
+      SYNCED_URI,
+      gBrowser.selectedBrowser.currentURI.displaySpec,
+      "We opened the tab via keyboard"
+    );
+
+    let sessionStorePromise = BrowserTestUtils.waitForSessionStoreUpdate(
+      gBrowser.selectedTab
+    );
+    gBrowser.removeTab(gBrowser.selectedTab);
+    await sessionStorePromise;
+
+    window.FirefoxViewHandler.openTab();
+
+    let recentlyClosedEle = await TestUtils.waitForCondition(() =>
+      document.querySelector(".closed-tab-li-main")
+    );
+    document.querySelectorAll(".page-section-header")[1].focus();
+
+    EventUtils.synthesizeKey("KEY_Tab");
+
+    is(
+      recentlyClosedEle,
+      document.activeElement,
+      "The recently closed tab is focused"
+    );
+
+    newTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, SYNCED_URI);
+    EventUtils.synthesizeKey("KEY_Enter");
+    await newTabPromise;
+    is(
+      SYNCED_URI,
+      gBrowser.selectedBrowser.currentURI.displaySpec,
+      "We opened the tab via keyboard"
+    );
+    gBrowser.removeTab(gBrowser.selectedTab);
+
+    sessionStorePromise = TestUtils.topicObserved(
+      "sessionstore-closed-objects-changed"
+    );
+    SessionStore.forgetClosedTab(window, 0);
+    await sessionStorePromise;
+
+    sandbox.restore();
+  });
+});