Bug 1932911 - don't check memory by default and make sure we pop the prefs r=cgopal

Differential Revision: https://phabricator.services.mozilla.com/D230048

Author: tarekziade

toolkit/components/extensions/test/browser/browser_ext_trial_ml.js

@@ -64,7 +64,6 @@ function createMlExtensionTest({
   prefs = [
     ["extensions.experiments.enabled", true],
     ["extensions.ml.enabled", true],
-    ["browser.ml.checkForMemory", false],
   ],
 }) {
   const func = async function () {
@@ -116,7 +115,6 @@ add_task(
     prefs: [
       ["extensions.experiments.enabled", true],
       ["extensions.ml.enabled", false],
-      ["browser.ml.checkForMemory", false],
     ],
   })
 );

toolkit/components/ml/tests/browser/browser_ml_engine.js

@@ -675,7 +675,9 @@ add_task(async function test_ml_engine_get_status() {
 });
 
 add_task(async function test_ml_engine_not_enough_memory() {
-  const { cleanup, remoteClients } = await setup();
+  const { cleanup, remoteClients } = await setup({
+    prefs: [["browser.ml.checkForMemory", true]],
+  });
 
   info("Get the greedy engine");
   const engineInstance = await createEngine({

toolkit/components/ml/tests/browser/head.js

@@ -54,7 +54,7 @@ async function setup({ disabled = false, prefs = [], records = null } = {}) {
       ["browser.ml.enable", !disabled],
       ["browser.ml.logLevel", "All"],
       ["browser.ml.modelCacheTimeout", 1000],
-      ["browser.ml.checkForMemory", true],
+      ["browser.ml.checkForMemory", false],
       ["browser.ml.queueWaitTimeout", 2],
       ["javascript.options.wasm_lazy_tiering", true],
       ...prefs,
@@ -71,6 +71,7 @@ async function setup({ disabled = false, prefs = [], records = null } = {}) {
         100,
         200
       );
+      await SpecialPowers.popPrefEnv();
     },
   };
 }