Backed out changeset 20828684a87d (bug 1585727) for mochitest failures at browser_preferences_usage.js on a CLOSED TREE.

browser/base/content/test/performance/browser.ini

@@ -19,6 +19,7 @@ support-files =
 [browser_appmenu.js]
 skip-if = asan || debug || (os == 'win' && bits == 32) || (os == 'win' && processor == 'aarch64') # Bug 1382809, bug 1369959, Win32 because of intermittent OOM failures, bug 1533141 for aarch64
 [browser_preferences_usage.js]
+fail-if = fission
 skip-if = !debug
 [browser_startup.js]
 [browser_startup_content.js]

browser/base/content/test/performance/browser_preferences_usage.js

@@ -132,11 +132,6 @@ add_task(async function startup() {
     },
   };
 
-  if (SpecialPowers.useRemoteSubframes) {
-    // Bug 1585732 - Number of accesses with Fission enabled is higher than without.
-    max = 50;
-  }
-
   let startupRecorder = Cc["@mozilla.org/test/startuprecorder;1"].getService()
     .wrappedJSObject;
   await startupRecorder.done;
@@ -215,20 +210,6 @@ add_task(async function navigate_around() {
     },
   };
 
-  if (SpecialPowers.useRemoteSubframes) {
-    // Bug 1585732 - Number of accesses with Fission enabled is higher than without.
-    max = 50;
-    whitelist = Object.assign(
-      {
-        "fission.rebuild_frameloaders_on_remoteness_change": {
-          min: 1,
-          max: 100,
-        },
-      },
-      whitelist
-    );
-  }
-
   Services.prefs.resetStats();
 
   let tab = await BrowserTestUtils.openNewForegroundTab(