Backed out changeset 2176eab309a8 (bug 1613953) for causing xpcshell failures at browser/extensions/doh-rollout/test/unit/test_localStorageMigration.js

CLOSED TREE

browser/extensions/doh-rollout/test/unit/test_localStorageMigration.js

@@ -57,6 +57,15 @@ add_task(async function setup() {
   );
   await AddonTestUtils.promiseStartupManager();
 
+  let extensionPath = Services.dirsvc.get("GreD", Ci.nsIFile);
+  extensionPath.append("browser");
+  extensionPath.append("features");
+  extensionPath.append(ADDON_ID);
+
+  if (!extensionPath.exists()) {
+    extensionPath.leafName = `${ADDON_ID}.xpi`;
+  }
+
   let startupPromise = new Promise(resolve => {
     const { apiManager } = ExtensionParent;
     function onReady(event, extension) {
@@ -69,9 +78,7 @@ add_task(async function setup() {
     apiManager.on("ready", onReady);
   });
 
-  await AddonManager.installBuiltinAddon(
-    "resource:///features/doh-rollout@mozilla.org/"
-  );
+  await AddonManager.installTemporaryAddon(extensionPath);
   await startupPromise;
 });