From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:35:37 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../content/test/static/browser_all_files_referenced.js  | 16 ++++++++++------
 browser/base/content/test/static/browser_parsable_css.js |  6 ++++++
 .../base/content/test/static/browser_parsable_script.js  |  1 +
 .../content/test/static/browser_sentence_case_strings.js |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'browser/base/content/test/static')

diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index d73c3fe8de..9668288181 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -276,12 +276,6 @@ var allowlist = [
   // find the references)
   { file: "chrome://browser/content/screenshots/copied-notification.svg" },
 
-  // Bug 1875361
-  { file: "chrome://global/content/ml/SummarizerModel.sys.mjs" },
-
-  // Bug 1886130
-  { file: "chrome://global/content/ml/ModelHub.sys.mjs" },
-
   // toolkit/xre/MacRunFromDmgUtils.mm
   { file: "resource://gre/localization/en-US/toolkit/global/run-from-dmg.ftl" },
 
@@ -290,6 +284,12 @@ var allowlist = [
   { file: "chrome://browser/content/screenshots/copy.svg" },
   { file: "chrome://browser/content/screenshots/download.svg" },
   { file: "chrome://browser/content/screenshots/download-white.svg" },
+
+  // Referenced programmatically
+  { file: "chrome://browser/content/backup/BackupManifest.1.schema.json" },
+
+  // Bug 1892002
+  { file: "resource://app/modules/TopSites.sys.mjs" },
 ];
 
 if (AppConstants.NIGHTLY_BUILD) {
@@ -301,6 +301,10 @@ if (AppConstants.NIGHTLY_BUILD) {
       // A debug tool that is only available in Nightly builds, and is accessed
       // directly by developers via the chrome URI (bug 1888491)
       { file: "chrome://browser/content/backup/debug.html" },
+
+      // The Transformers.js prod lib is not used in Nightly builds
+      { file: "chrome://global/content/ml/transformers.js" },
+      { file: "chrome://global/content/ml/ort.js" },
     ]
   );
 }
diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js
index fb91da578a..6b075fc98f 100644
--- a/browser/base/content/test/static/browser_parsable_css.js
+++ b/browser/base/content/test/static/browser_parsable_css.js
@@ -36,6 +36,12 @@ let ignoreList = [
     errorMessage: /Unknown property.*overflow-clip-box/i,
     isFromDevTools: false,
   },
+  // content: -moz-alt-content is UA-only.
+  {
+    sourceName: /\b(html)\.css$/i,
+    errorMessage: /Error in parsing value for ‘content’/i,
+    isFromDevTools: false,
+  },
   // These variables are declared somewhere else, and error when we load the
   // files directly. They're all marked intermittent because their appearance
   // in the error console seems to not be consistent.
diff --git a/browser/base/content/test/static/browser_parsable_script.js b/browser/base/content/test/static/browser_parsable_script.js
index 3d8fbc1535..71a2930ddc 100644
--- a/browser/base/content/test/static/browser_parsable_script.js
+++ b/browser/base/content/test/static/browser_parsable_script.js
@@ -19,6 +19,7 @@ const kESModuleList = new Set([
   /browser\/vpn-card.js$/,
   /toolkit\/content\/global\/certviewer\/components\/.*\.js$/,
   /toolkit\/content\/global\/certviewer\/.*\.js$/,
+  /toolkit\/content\/global\/ml\/transformers.*\.js$/,
   /chrome\/pdfjs\/content\/web\/.*\.js$/,
 ]);
 
diff --git a/browser/base/content/test/static/browser_sentence_case_strings.js b/browser/base/content/test/static/browser_sentence_case_strings.js
index e995f76b1a..12952c9600 100644
--- a/browser/base/content/test/static/browser_sentence_case_strings.js
+++ b/browser/base/content/test/static/browser_sentence_case_strings.js
@@ -103,7 +103,7 @@ function checkSubheaders(view) {
 }
 
 async function checkUpdateBanner(view) {
-  let banner = view.querySelector("#appMenu-proton-update-banner");
+  let banner = view.querySelector("#appMenu-update-banner");
 
   const notifications = [
     "update-downloading",
-- 
cgit v1.2.3