Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 44 insertions, 40 deletions

diff --git a/browser/extensions/webcompat/data/shims.js b/browser/extensions/webcompat/data/shims.js
index f26ad96d04..ab7234c217 100644
--- a/browser/extensions/webcompat/data/shims.js
+++ b/browser/extensions/webcompat/data/shims.js
@@ -673,6 +673,8 @@ const AVAILABLE_SHIMS = [
       ["*://teams.microsoft.com/*", "*://login.microsoftonline.com/*"],
       ["*://*.teams.microsoft.us/*", "*://login.microsoftonline.us/*"],
       ["*://www.msn.com/*", "*://login.microsoftonline.com/*"],
+      ["*://support.microsoft.com/*", "*://login.microsoftonline.com/*"],
+      ["*://answers.microsoft.com/*", "*://login.microsoftonline.com/*"],
     ],
     contentScripts: [
       {
@@ -682,6 +684,8 @@ const AVAILABLE_SHIMS = [
           "*://teams.microsoft.com/*",
           "*://*.teams.microsoft.us/*",
           "*://www.msn.com/*",
+          "*://support.microsoft.com/*",
+          "*://answers.microsoft.com/*",
         ],
         runAt: "document_start",
       },
diff --git a/browser/extensions/webcompat/data/ua_overrides.js b/browser/extensions/webcompat/data/ua_overrides.js
index 3645e962f0..22124c4f23 100644
--- a/browser/extensions/webcompat/data/ua_overrides.js
+++ b/browser/extensions/webcompat/data/ua_overrides.js
@@ -225,7 +225,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1574564",
     config: {
       matches: ["*://*.ceskatelevize.cz/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -302,7 +302,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1622063",
     config: {
       matches: ["*://wp1-ext.usps.gov/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -429,7 +429,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1719859",
     config: {
       matches: ["*://*.saxoinvestor.fr/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -546,7 +546,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1753461",
     config: {
       matches: ["*://serieson.naver.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36";
       },
     },
@@ -565,7 +565,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1771200",
     config: {
       matches: ["*://*.animalplanet.com/video/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -584,7 +584,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1779059",
     config: {
       matches: ["*://member-m.lazada.co.id/address/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -603,7 +603,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1778168",
     config: {
       matches: ["*://watch.antennaplus.gr/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA({
           desktopOS: "nonLinux",
         });
@@ -623,7 +623,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1776897",
     config: {
       matches: ["*://www.edencast.fr/zoomcast*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -641,7 +641,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1784361",
     config: {
       matches: ["*://*.coldwellbankerhomes.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -678,7 +678,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1819702",
     config: {
       matches: ["*://*.feelgoodcontacts.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -694,7 +694,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1823966",
     config: {
       matches: ["*://*.elearning.dmv.ca.gov/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -710,7 +710,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://*.admissions.nid.edu/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -726,7 +726,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://*.bankmandiri.co.id/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -742,7 +742,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://*.frankfred.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -758,7 +758,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://mobile.onvue.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -774,7 +774,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://*.avizia.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -790,7 +790,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://www.yourtexasbenefits.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -806,7 +806,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://www.free4talk.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -822,7 +822,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://watch.indee.tv/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -838,7 +838,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://viewer-ebook.books.com.tw/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -854,7 +854,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://jelly.jd.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -870,7 +870,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://*.kt.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -886,7 +886,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://*.oirsa.org/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -902,7 +902,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1827678",
     config: {
       matches: ["*://onp.cloud.waterloo.ca/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -927,7 +927,7 @@ const AVAILABLE_UA_OVERRIDES = [
         "*://*.yebocasino.co.za/*", // 88409
         "*://*.yabbycasino.com/*", // 108025
       ],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -943,7 +943,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1830821",
     config: {
       matches: ["*://*.webcartop.jp/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -959,7 +959,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1830821",
     config: {
       matches: ["*://enjoy.point.auone.jp/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -976,7 +976,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1836109",
     config: {
       matches: ["*://watch.tonton.com.my/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -993,7 +993,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1836112",
     config: {
       matches: ["*://www.capcut.cn/editor*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1078,7 +1078,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1836182",
     config: {
       matches: ["*://*.flatsatshadowglen.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1097,7 +1097,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1849018",
     config: {
       matches: ["*://*.carefirst.com/myaccount*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1115,7 +1115,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1850455",
     config: {
       matches: ["*://*.frontgate.com/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1134,7 +1134,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1855088",
     config: {
       matches: ["*://hrmis2.eghrmis.gov.my/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1152,7 +1152,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1855102",
     config: {
       matches: ["*://my.southerncross.co.nz/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1197,7 +1197,7 @@ const AVAILABLE_UA_OVERRIDES = [
         "*://magazine.kruidvat.be/*",
         "*://folder.kruidvat.nl/*",
       ],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1215,7 +1215,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1864999",
     config: {
       matches: ["*://*.autotrader.ca/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1234,7 +1234,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1865000",
     config: {
       matches: ["*://*.bmo.com/main/personal/*/getting-started/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1252,7 +1252,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1865004",
     config: {
       matches: ["*://*.digimart.net/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1270,7 +1270,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1865007",
     config: {
       matches: ["*://*.circle.ms/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: () => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },
@@ -1288,7 +1288,7 @@ const AVAILABLE_UA_OVERRIDES = [
     bug: "1884779",
     config: {
       matches: ["*://*.memurlar.net/*"],
-      uaTransformer: originalUA => {
+      uaTransformer: _originalUA => {
         return UAHelpers.getDeviceAppropriateChromeUA();
       },
     },