From 127d08ec0bffb429094a919c2bded8b94be2f244 Mon Sep 17 00:00:00 2001
From: Daniel Thorn <dthorn@mozilla.com>
Date: Thu, 1 May 2025 22:39:39 +0000
Subject: [PATCH] Bug 1959483 - Port tests from ExperimentFakes and
 ExperimentTestUtils to NimbusTestUtils in browser/components/shell
 r=nimbus-reviewers,beth

Differential Revision: https://phabricator.services.mozilla.com/D247016
---
 .../components/shell/test/browser_doesAppNeedPin.js    |  4 ++--
 .../components/shell/test/browser_setDefaultBrowser.js |  8 ++++----
 .../shell/test/browser_setDefaultPDFHandler.js         | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/browser/components/shell/test/browser_doesAppNeedPin.js b/browser/components/shell/test/browser_doesAppNeedPin.js
index f6e4ee26c69f..00165cada96b 100644
--- a/browser/components/shell/test/browser_doesAppNeedPin.js
+++ b/browser/components/shell/test/browser_doesAppNeedPin.js
@@ -2,8 +2,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 ChromeUtils.defineESModuleGetters(this, {
-  ExperimentFakes: "resource://testing-common/NimbusTestUtils.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
+  NimbusTestUtils: "resource://testing-common/NimbusTestUtils.sys.mjs",
 });
 
 let defaultValue;
@@ -19,7 +19,7 @@ add_task(async function remote_disable() {
     return;
   }
 
-  let doCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  let doCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: { disablePin: true, enabled: true },
diff --git a/browser/components/shell/test/browser_setDefaultBrowser.js b/browser/components/shell/test/browser_setDefaultBrowser.js
index 12b670ca7af5..c2829201c06f 100644
--- a/browser/components/shell/test/browser_setDefaultBrowser.js
+++ b/browser/components/shell/test/browser_setDefaultBrowser.js
@@ -4,8 +4,8 @@
 ChromeUtils.defineESModuleGetters(this, {
   ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
-  ExperimentFakes: "resource://testing-common/NimbusTestUtils.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
+  NimbusTestUtils: "resource://testing-common/NimbusTestUtils.sys.mjs",
   sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
@@ -59,7 +59,7 @@ add_task(async function remote_disable() {
 
   userChoiceStub.resetHistory();
   setDefaultStub.resetHistory();
-  let doCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  let doCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: {
@@ -116,7 +116,7 @@ add_task(async function ensure_fallback() {
   });
   userChoiceStub.resetHistory();
   setDefaultStub.resetHistory();
-  let doCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  let doCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: {
@@ -146,7 +146,7 @@ add_task(async function ensure_fallback() {
 
 async function setUpNotificationTests(guidanceEnabled, oneClick) {
   sinon.reset();
-  const experimentCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  const experimentCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: {
diff --git a/browser/components/shell/test/browser_setDefaultPDFHandler.js b/browser/components/shell/test/browser_setDefaultPDFHandler.js
index 8c2d417737fa..76ea1ec6bdab 100644
--- a/browser/components/shell/test/browser_setDefaultPDFHandler.js
+++ b/browser/components/shell/test/browser_setDefaultPDFHandler.js
@@ -3,8 +3,8 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
-  ExperimentFakes: "resource://testing-common/NimbusTestUtils.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
+  NimbusTestUtils: "resource://testing-common/NimbusTestUtils.sys.mjs",
   sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
@@ -53,7 +53,7 @@ add_task(async function ready() {
 Assert.ok(AppConstants.platform == "win", "Platform is Windows");
 
 add_task(async function remoteEnableWithPDF() {
-  let doCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  let doCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: {
@@ -89,7 +89,7 @@ add_task(async function remoteEnableWithPDF() {
 });
 
 add_task(async function remoteEnableWithPDF_testOnlyReplaceBrowsers() {
-  let doCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  let doCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: {
@@ -151,7 +151,7 @@ add_task(async function remoteEnableWithPDF_testOnlyReplaceBrowsers() {
 });
 
 add_task(async function remoteEnableWithoutPDF() {
-  let doCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  let doCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: {
@@ -183,7 +183,7 @@ add_task(async function remoteEnableWithoutPDF() {
 });
 
 add_task(async function remoteDisable() {
-  let doCleanup = await ExperimentFakes.enrollWithFeatureConfig(
+  let doCleanup = await NimbusTestUtils.enrollWithFeatureConfig(
     {
       featureId: NimbusFeatures.shellService.featureId,
       value: {