[pull] main from mozilla-firefox:main

Cargo.toml

@@ -128,6 +128,10 @@ mozilla-central-workspace-hack = { path = "build/workspace-hack" }
 # crate, which we don't really need as we require MSVC anyways.
 windows-targets = { path = "build/rust/windows-targets" }
 
+# windows-link replacement that doesn't use raw-dylibs, which have problems on
+# the i686-pc-windows-gnu target.
+windows-link = { path = "build/rust/windows-link" }
+
 # Patch windows to use a non-vendored local copy of the crate.
 windows = { path = "build/rust/windows" }
 

browser/components/aiwindow/models/Utils.sys.mjs

@@ -14,7 +14,8 @@ import { createEngine } from "chrome://global/content/ml/EngineProcess.sys.mjs";
 import { getFxAccountsSingleton } from "resource://gre/modules/FxAccounts.sys.mjs";
 import {
   OAUTH_CLIENT_ID,
-  SCOPE_PROFILE,
+  SCOPE_PROFILE_UID,
+  SCOPE_SMART_WINDOW,
 } from "resource://gre/modules/FxAccountsCommon.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
@@ -624,8 +625,7 @@ export class openAIEngine {
     try {
       const fxAccounts = getFxAccountsSingleton();
       return await fxAccounts.getOAuthToken({
-        // Scope needs to be updated in accordance with https://bugzilla.mozilla.org/show_bug.cgi?id=2005290
-        scope: SCOPE_PROFILE,
+        scope: [SCOPE_SMART_WINDOW, SCOPE_PROFILE_UID],
         client_id: OAUTH_CLIENT_ID,
       });
     } catch (error) {

browser/components/aiwindow/models/tests/browser/browser.toml

@@ -12,4 +12,5 @@ prefs = [
 ["browser_getCurrentTabMetadata.js"]
 ["browser_get_page_content.js"]
 ["browser_title_generation.js"]
+["browser_utils_fxAccount.js"]
 ["browser_utils_loadConfig.js"]

browser/components/aiwindow/models/tests/browser/browser_utils_fxAccount.js

@@ -0,0 +1,81 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const { openAIEngine } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+);
+
+const { OAUTH_CLIENT_ID, SCOPE_PROFILE_UID, SCOPE_SMART_WINDOW } =
+  ChromeUtils.importESModule("resource://gre/modules/FxAccountsCommon.sys.mjs");
+
+const { getFxAccountsSingleton } = ChromeUtils.importESModule(
+  "resource://gre/modules/FxAccounts.sys.mjs"
+);
+
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
+
+add_task(async function test_getFxAccountToken_passes_correct_scope() {
+  const fakeToken = "fake-oauth-token";
+  const fxAccounts = getFxAccountsSingleton();
+
+  const getOAuthTokenStub = sinon
+    .stub(fxAccounts, "getOAuthToken")
+    .resolves(fakeToken);
+
+  try {
+    const token = await openAIEngine.getFxAccountToken();
+
+    Assert.ok(
+      getOAuthTokenStub.calledOnce,
+      "getOAuthToken should be called once"
+    );
+
+    const callArgs = getOAuthTokenStub.getCall(0).args[0];
+    Assert.ok(callArgs, "getOAuthToken should be called with arguments");
+    Assert.deepEqual(
+      callArgs.scope,
+      [SCOPE_SMART_WINDOW, SCOPE_PROFILE_UID],
+      "getOAuthToken should be called with correct scope array"
+    );
+    Assert.equal(
+      callArgs.client_id,
+      OAUTH_CLIENT_ID,
+      "getOAuthToken should be called with correct client_id"
+    );
+    Assert.equal(
+      token,
+      fakeToken,
+      "getFxAccountToken should return the token from getOAuthToken"
+    );
+  } finally {
+    getOAuthTokenStub.restore();
+  }
+});
+
+add_task(async function test_getFxAccountToken_returns_null_on_error() {
+  const fxAccounts = getFxAccountsSingleton();
+
+  const getOAuthTokenStub = sinon
+    .stub(fxAccounts, "getOAuthToken")
+    .rejects(new Error("FxA authentication failed"));
+
+  try {
+    const token = await openAIEngine.getFxAccountToken();
+
+    Assert.ok(
+      getOAuthTokenStub.calledOnce,
+      "getOAuthToken should be called once"
+    );
+    Assert.equal(
+      token,
+      null,
+      "getFxAccountToken should return null when getOAuthToken throws an error"
+    );
+  } finally {
+    getOAuthTokenStub.restore();
+  }
+});

browser/components/genai/GenAIChild.sys.mjs

@@ -28,6 +28,11 @@ export class GenAIChild extends JSWindowActorChild {
   debounceDelay = 200;
   pendingHide = false;
 
+  /**
+   * A flag that gets set when this actor is destroyed.
+   */
+  #isDestroyed = false;
+
   registerHideEvents() {
     this.document.addEventListener("selectionchange", this);
     HIDE_EVENTS.forEach(ev =>
@@ -79,6 +84,10 @@ export class GenAIChild extends JSWindowActorChild {
         const { screenX, screenY } = event;
 
         this.mouseUpTimeout = this.contentWindow.setTimeout(() => {
+          if (this.#isDestroyed) {
+            return;
+          }
+
           const selectionInfo = this.getSelectionInfo();
           const delay = event.timeStamp - this.downTimeStamp;
 
@@ -277,4 +286,8 @@ export class GenAIChild extends JSWindowActorChild {
         .replace(/(\s*\n\s*)|\s{2,}/g, (_, newline) => (newline ? "\n" : " ")),
     };
   }
+
+  didDestroy() {
+    this.#isDestroyed = true;
+  }
 }

browser/components/search/test/browser/browser.toml

@@ -21,6 +21,10 @@ prefs = ["browser.search.widget.new=false"]
 
 ["browser_426329.js"]
 support-files = ["test.html", "discovery.html", "426329.xml"]
+skip-if = [
+  "os == 'win' && os_version == '11.26100' && arch == 'x86_64' && debug", # Bug 1920926 and being removed in bug 2012951
+  "os == 'win' && os_version == '11.26100' && arch == 'x86_64' && asan", # Bug 1920926 and being removed in bug 2012951
+]
 
 ["browser_addSearchEngineFromForm.js"]
 support-files = ["test.html", "test_windows1252.html"]

browser/components/search/test/browser/browser_426329.js

@@ -162,6 +162,10 @@ add_task(async function testShiftReturn() {
 });
 
 add_task(async function testAltReturn() {
+  // Ensure the history has been updated so that it is complete when we
+  // get to the clear history test.
+  let historyUpdated = TestUtils.topicObserved("satchel-storage-changed");
+
   await prepareTest("testAltReturn");
   await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
     EventUtils.synthesizeKey("KEY_Enter", { altKey: true });
@@ -173,6 +177,8 @@ add_task(async function testAltReturn() {
     expectedURL(searchBar.value),
     "testAltReturn opened correct search page"
   );
+
+  await historyUpdated;
 });
 
 add_task(async function testAltReturnEmpty() {
@@ -187,6 +193,10 @@ add_task(async function testAltReturnEmpty() {
 });
 
 add_task(async function testAltGrReturn() {
+  // Ensure the history has been updated so that it is complete when we
+  // get to the clear history test.
+  let historyUpdated = TestUtils.topicObserved("satchel-storage-changed");
+
   await prepareTest("testAltGrReturn");
   await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
     EventUtils.synthesizeKey("KEY_Enter", { altGraphKey: true });
@@ -198,6 +208,8 @@ add_task(async function testAltGrReturn() {
     expectedURL(searchBar.value),
     "testAltGrReturn opened correct search page"
   );
+
+  await historyUpdated;
 });
 
 add_task(async function testAltGrReturnEmpty() {
@@ -229,6 +241,10 @@ add_task(async function testShiftAltReturnEmpty() {
 });
 
 add_task(async function testLeftClick() {
+  // Ensure the history has been updated so that it is complete when we
+  // get to the clear history test.
+  let historyUpdated = TestUtils.topicObserved("satchel-storage-changed");
+
   await prepareTest("testLeftClick");
   simulateClick({ button: 0 }, searchButton);
   await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
@@ -238,9 +254,15 @@ add_task(async function testLeftClick() {
     expectedURL(searchBar.value),
     "testLeftClick opened correct search page"
   );
+
+  await historyUpdated;
 });
 
 add_task(async function testMiddleClick() {
+  // Ensure the history has been updated so that it is complete when we
+  // get to the clear history test.
+  let historyUpdated = TestUtils.topicObserved("satchel-storage-changed");
+
   await prepareTest("testMiddleClick");
   await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
     simulateClick({ button: 1 }, searchButton);
@@ -251,9 +273,15 @@ add_task(async function testMiddleClick() {
     expectedURL(searchBar.value),
     "testMiddleClick opened correct search page"
   );
+
+  await historyUpdated;
 });
 
 add_task(async function testShiftMiddleClick() {
+  // Ensure the history has been updated so that it is complete when we
+  // get to the clear history test.
+  let historyUpdated = TestUtils.topicObserved("satchel-storage-changed");
+
   await prepareTest("testShiftMiddleClick");
 
   let url = expectedURL(searchBar.value);
@@ -268,6 +296,8 @@ add_task(async function testShiftMiddleClick() {
     url,
     "testShiftMiddleClick opened correct search page"
   );
+
+  await historyUpdated;
 });
 
 add_task(async function testRightClick() {
@@ -291,7 +321,12 @@ add_task(async function testRightClick() {
   });
   // The click in the searchbox focuses it, which opens the suggestion
   // panel. Clean up after ourselves.
-  searchBar.textbox.popup.hidePopup();
+  let popupHiddenPromise = BrowserTestUtils.waitForPopupEvent(
+    searchBar.textbox.popup,
+    "hidden"
+  );
+  searchBar.textbox.closePopup();
+  await popupHiddenPromise;
 });
 
 add_task(async function testSearchHistory() {
@@ -311,37 +346,49 @@ add_task(async function testSearchHistory() {
 
 add_task(async function testAutocomplete() {
   let popup = searchBar.textbox.popup;
-  let popupShownPromise = BrowserTestUtils.waitForEvent(popup, "popupshown");
+  let popupShownPromise = BrowserTestUtils.waitForPopupEvent(popup, "shown");
   searchBar.textbox.showHistoryPopup();
   await popupShownPromise;
+
   checkMenuEntries(searchEntries);
+
+  let popupHiddenPromise = BrowserTestUtils.waitForPopupEvent(popup, "hidden");
   searchBar.textbox.closePopup();
+  await popupHiddenPromise;
 });
 
 add_task(async function testClearHistory() {
-  // Open the textbox context menu to trigger controller attachment.
   let textbox = searchBar.textbox;
-  let popupShownPromise = BrowserTestUtils.waitForEvent(
-    window,
-    "popupshown",
-    false,
-    event => event.target.classList.contains("textbox-contextmenu")
+
+  // If the menu hasn't been built yet, then force it to be built.
+  if (!searchBar._menupopup) {
+    searchBar._buildContextMenu();
+  }
+  let popupShownPromise = BrowserTestUtils.waitForPopupEvent(
+    searchBar._menupopup,
+    "shown"
   );
   EventUtils.synthesizeMouseAtCenter(textbox, {
     type: "contextmenu",
     button: 2,
   });
   await popupShownPromise;
-  // Close the context menu.
-  let contextMenu = document.querySelector(".textbox-contextmenu");
-  contextMenu.hidePopup();
 
   let menuitem = searchBar._menupopup.querySelector(".searchbar-clear-history");
   ok(!menuitem.disabled, "Clear history menuitem enabled");
 
   let historyCleared = promiseObserver("satchel-storage-changed");
   searchBar._menupopup.activateItem(menuitem);
   await historyCleared;
+
+  // Close the context menu.
+  let popupHiddenPromise = BrowserTestUtils.waitForPopupEvent(
+    searchBar._menupopup,
+    "hidden"
+  );
+  searchBar._menupopup.hidePopup();
+  await popupHiddenPromise;
+
   let count = await FormHistoryTestUtils.count(
     textbox.getAttribute("autocompletesearchparam")
   );

browser/components/tabbrowser/content/tabbrowser.js

@@ -3471,7 +3471,7 @@
       for (const tab of tabs) {
         this.tabpanels.setSplitViewPanelActive(isActive, tab.linkedPanel);
       }
-      this.tabpanels.isSplitViewActive = gBrowser.selectedTab.splitview;
+      this.tabpanels.setSplitViewActive(!!gBrowser.selectedTab.splitview);
     }
 
     /**
@@ -9338,6 +9338,13 @@
             PrivateBrowsingUtils.isWindowPrivate(window)
           );
           this.mBrowser.registeredOpenURI = aLocation;
+
+          // Record telemetry for URI loads in split view
+          if (this.mTab.splitview && aLocation.spec !== "about:opentabs") {
+            const index = this.mTab.splitview.tabs.indexOf(this.mTab);
+            const label = String(index + 1); // 0 -> "1" (LTR left), 1 -> "2" (LTR right)
+            Glean.splitview.uriCount[label].add(1);
+          }
         }
 
         if (this.mTab != gBrowser.selectedTab) {

browser/components/tabbrowser/content/tabsplitview.js

@@ -304,6 +304,18 @@
 
       this.#activate();
       gBrowser.setIsSplitViewActive(this.hasActiveTab, this.#tabs);
+
+      // Attempt to update uriCount metric using the resulting tabs collection,
+      // as tabs may not be added to the splitview if they are pinned etc.
+      for (let tab of this.tabs) {
+        let tabURI = tab.linkedBrowser.currentURI.spec;
+        if (!isBlankPageURL(tabURI) && tabURI !== "about:opentabs") {
+          // Add to the counter which tracks the number of URIs loaded into splitview tabs
+          const index = tabs.indexOf(tab);
+          const label = String(index + 1); // 0 -> "1" (LTR left), 1 -> "2" (LTR right)
+          Glean.splitview.uriCount[label].add(1);
+        }
+      }
     }
 
     /**