From 4f49ff3290931e413c4e69416d9b2fc457118c9c Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 29 Apr 2025 18:18:48 +0200
Subject: [PATCH] fix: Fixed PGO builds and test runs, b=(no-bug),
 c=no-component

---
 src/testing/profiles/mochitest/user-js.patch     |  5 +++--
 src/testing/profiles/profileserver/user-js.patch |  5 +++--
 src/toolkit/modules/ShortcutUtils-sys-mjs.patch  | 12 ++++++++++--
 surfer.json                                      |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/testing/profiles/mochitest/user-js.patch b/src/testing/profiles/mochitest/user-js.patch
index f3aaea0e8..ad2b941d4 100644
--- a/src/testing/profiles/mochitest/user-js.patch
+++ b/src/testing/profiles/mochitest/user-js.patch
@@ -1,8 +1,8 @@
 diff --git a/testing/profiles/mochitest/user.js b/testing/profiles/mochitest/user.js
-index a4068ac3f61161d014c49d54ae7a3bf886868f1b..b9861cfaae19a4a71b75ccc73095dc602df22b12 100644
+index a4068ac3f61161d014c49d54ae7a3bf886868f1b..6af5907abb46b6d3b871c159c73eec8373ee8ef5 100644
 --- a/testing/profiles/mochitest/user.js
 +++ b/testing/profiles/mochitest/user.js
-@@ -41,3 +41,9 @@ user_pref("places.history.floodingPrevention.enabled", false);
+@@ -41,3 +41,10 @@ user_pref("places.history.floodingPrevention.enabled", false);
  // permission, and we can open it and wait for the user to give permission, then
  // don't do that.
  user_pref("geo.prompt.open_system_prefs", false);
@@ -12,3 +12,4 @@ index a4068ac3f61161d014c49d54ae7a3bf886868f1b..b9861cfaae19a4a71b75ccc73095dc60
 +user_pref("zen.watermark.enabled", false);
 +user_pref("zen.urlbar.replace-newtab", false);
 +user_pref("zen.testing.enabled", true);
++user_pref("dom.security.https_only_mode", false); // Dont ask why
diff --git a/src/testing/profiles/profileserver/user-js.patch b/src/testing/profiles/profileserver/user-js.patch
index 6b48c861e..ccfcc06ae 100644
--- a/src/testing/profiles/profileserver/user-js.patch
+++ b/src/testing/profiles/profileserver/user-js.patch
@@ -1,8 +1,8 @@
 diff --git a/testing/profiles/profileserver/user.js b/testing/profiles/profileserver/user.js
-index 19ff7d474f6d22d2d386764e2e6942ce6a324470..a68a1f692e050c2a2a7e5e1390dec9556e71d7ed 100644
+index 19ff7d474f6d22d2d386764e2e6942ce6a324470..b8a915b921e624c416d2ec379a2b54aedfcf9c36 100644
 --- a/testing/profiles/profileserver/user.js
 +++ b/testing/profiles/profileserver/user.js
-@@ -8,3 +8,11 @@
+@@ -8,3 +8,12 @@
  user_pref("dom.timeout.enable_budget_timer_throttling", false);
  // Turn off update
  user_pref("app.update.disabledForTesting", true);
@@ -14,3 +14,4 @@ index 19ff7d474f6d22d2d386764e2e6942ce6a324470..a68a1f692e050c2a2a7e5e1390dec955
 +user_pref("zen.watermark.enabled", false);
 +user_pref("zen.urlbar.replace-newtab", false);
 +user_pref("zen.testing.enabled", true);
++user_pref("dom.security.https_only_mode", false); // Dont ask why
diff --git a/src/toolkit/modules/ShortcutUtils-sys-mjs.patch b/src/toolkit/modules/ShortcutUtils-sys-mjs.patch
index fe61b602a..11dd0b994 100644
--- a/src/toolkit/modules/ShortcutUtils-sys-mjs.patch
+++ b/src/toolkit/modules/ShortcutUtils-sys-mjs.patch
@@ -1,8 +1,16 @@
 diff --git a/toolkit/modules/ShortcutUtils.sys.mjs b/toolkit/modules/ShortcutUtils.sys.mjs
-index 360a7dbeeae3899af01945e35d5fe3aa0cb3c562..895d39fe5887ffae9cdbce9576df8b00d4cc8442 100644
+index 360a7dbeeae3899af01945e35d5fe3aa0cb3c562..354c0c9e65e443682a2b12113bc618af9e07910f 100644
 --- a/toolkit/modules/ShortcutUtils.sys.mjs
 +++ b/toolkit/modules/ShortcutUtils.sys.mjs
-@@ -382,12 +382,12 @@ export var ShortcutUtils = {
+@@ -140,6 +140,7 @@ export var ShortcutUtils = {
+         key = keyCode.replace(/^VK_/, "");
+       }
+     } else {
++      if (!keyAttribute) return "";
+       key = keyAttribute.toUpperCase();
+     }
+ 
+@@ -382,12 +383,12 @@ export var ShortcutUtils = {
            return ShortcutUtils.MOVE_TAB_FORWARD;
          }
          break;
diff --git a/surfer.json b/surfer.json
index 6074c44e6..65e0eef17 100644
--- a/surfer.json
+++ b/surfer.json
@@ -4,7 +4,7 @@
   "appId": "zen",
   "binaryName": "zen",
   "version": {
-    "product": "firefox-beta",
+    "product": "firefox",
     "version": "137.0.2",
     "candidate": "138.0"
   },