Bug 1340586 Part 3 Split up browser_extension_permissions.js r=mossop
authorAndrew Swan <aswan@mozilla.com>
Thu, 23 Feb 2017 16:30:33 -0800
changeset 374139 06efe0295e1e68eff1e3a61af0ece9049bf3a10b
parent 374138 c8bcd3a86de60830bb2d7c8b8b49136a402cf1ff
child 374140 9c87e4453a8a3cb35e8bc4d68caf0037fec8b5df
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs1340586
milestone54.0a1
Bug 1340586 Part 3 Split up browser_extension_permissions.js r=mossop MozReview-Commit-ID: A7NLR6f1VVO
browser/base/content/test/webextensions/browser.ini
browser/base/content/test/webextensions/browser_extension_permissions.js
browser/base/content/test/webextensions/browser_permissions_addons_search.js
browser/base/content/test/webextensions/browser_permissions_installTrigger.js
browser/base/content/test/webextensions/browser_permissions_local_file.js
browser/base/content/test/webextensions/browser_permissions_mozAddonManager.js
--- a/browser/base/content/test/webextensions/browser.ini
+++ b/browser/base/content/test/webextensions/browser.ini
@@ -10,12 +10,15 @@ support-files =
   browser_webext_update2.xpi
   browser_webext_update_icon1.xpi
   browser_webext_update_icon2.xpi
   browser_webext_update_perms1.xpi
   browser_webext_update_perms2.xpi
   browser_webext_update.json
   browser_webext_search.xml
 
-[browser_extension_permissions.js]
 [browser_extension_sideloading.js]
 [browser_extension_update_background.js]
 [browser_extension_update_interactive.js]
+[browser_permissions_addons_search.js]
+[browser_permissions_installTrigger.js]
+[browser_permissions_local_file.js]
+[browser_permissions_mozAddonManager.js]
rename from browser/base/content/test/webextensions/browser_extension_permissions.js
rename to browser/base/content/test/webextensions/browser_permissions_addons_search.js
--- a/browser/base/content/test/webextensions/browser_extension_permissions.js
+++ b/browser/base/content/test/webextensions/browser_permissions_addons_search.js
@@ -1,215 +1,42 @@
 "use strict";
 
-// See but 1340586 for proposal to reorganize permissions tests to
-// get rid of this...
-requestLongerTimeout(2);
+async function installSearch(filename) {
+  await SpecialPowers.pushPrefEnv({set: [
+    ["extensions.getAddons.maxResults", 10],
+    ["extensions.getAddons.search.url", `${BASE}/browser_webext_search.xml`],
+  ]});
 
-const INSTALL_PAGE = `${BASE}/file_install_extensions.html`;
-const PERMS_XPI = "browser_webext_permissions.xpi";
-const NO_PERMS_XPI = "browser_webext_nopermissions.xpi";
-const ID = "permissions@test.mozilla.org";
+  let win = await BrowserOpenAddonsMgr("addons://list/extension");
 
-Services.perms.add(makeURI("https://example.com/"), "install",
-                   Services.perms.ALLOW_ACTION);
-
-function isDefaultIcon(icon) {
-  // These are basically the same icon, but code within webextensions
-  // generates references to the former and generic add-ons manager code
-  // generates referces to the latter.
-  return (icon == "chrome://browser/content/extension.svg" ||
-          icon == "chrome://mozapps/skin/extensions/extensionGeneric.svg");
-}
-
-function checkNotification(panel, filename) {
-  let icon = panel.getAttribute("icon");
+  let searchResultsPromise = new Promise(resolve => {
+    win.document.addEventListener("ViewChanged", resolve, {once: true});
+  });
+  let search = win.document.getElementById("header-search");
+  search.focus();
+  search.value = "search text";
+  EventUtils.synthesizeKey("VK_RETURN", {}, win);
 
-  let ul = document.getElementById("addon-webext-perm-list");
-  let header = document.getElementById("addon-webext-perm-intro");
-
-  if (filename == PERMS_XPI) {
-    // The icon should come from the extension, don't bother with the precise
-    // path, just make sure we've got a jar url pointing to the right path
-    // inside the jar.
-    ok(icon.startsWith("jar:file://"), "Icon is a jar url");
-    ok(icon.endsWith("/icon.png"), "Icon is icon.png inside a jar");
+  await searchResultsPromise;
+  ok(win.gViewController.currentViewId.startsWith("addons://search"),
+     "about:addons is displaying search results");
 
-    is(header.getAttribute("hidden"), "", "Permission list header is visible");
-    is(ul.childElementCount, 5, "Permissions list has 5 entries");
-    // Real checking of the contents here is deferred until bug 1316996 lands
-  } else if (filename == NO_PERMS_XPI) {
-    // This extension has no icon, it should have the default
-    ok(isDefaultIcon(icon), "Icon is the default extension icon");
+  let list = win.document.getElementById("search-list");
+  let item = null;
+  for (let child of list.childNodes) {
+    if (child.nodeName == "richlistitem" &&
+        child.mAddon.install.sourceURI.path.endsWith(filename)) {
+          item = child;
+          break;
+    }
+  }
+  ok(item, `Found ${filename} in search results`);
 
-    is(header.getAttribute("hidden"), "true", "Permission list header is hidden");
-    is(ul.childElementCount, 0, "Permissions list has 0 entries");
-  }
-}
+  // abracadabara XBL
+  item.clientTop;
 
-// Navigate the current tab to the given url and return a Promise
-// that resolves when the page is loaded.
-function load(url) {
-  gBrowser.selectedBrowser.loadURI(INSTALL_PAGE);
-  return BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  let install = win.document.getAnonymousElementByAttribute(item, "anonid", "install-status");
+  let button = win.document.getAnonymousElementByAttribute(install, "anonid", "install-remote-btn");
+  EventUtils.synthesizeMouseAtCenter(button, {}, win);
 }
 
-const INSTALL_FUNCTIONS = [
-  async function installMozAM(filename) {
-    await load(INSTALL_PAGE);
-
-    await ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      yield content.wrappedJSObject.installMozAM(url);
-    });
-  },
-
-  async function installTrigger(filename) {
-    await load(INSTALL_PAGE);
-
-    ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      content.wrappedJSObject.installTrigger(url);
-    });
-  },
-
-  async function installFile(filename) {
-    const ChromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"]
-                                       .getService(Ci.nsIChromeRegistry);
-    let chromeUrl = Services.io.newURI(gTestPath);
-    let fileUrl = ChromeRegistry.convertChromeURL(chromeUrl);
-    let file = fileUrl.QueryInterface(Ci.nsIFileURL).file;
-    file.leafName = filename;
-
-    let MockFilePicker = SpecialPowers.MockFilePicker;
-    MockFilePicker.init(window);
-    MockFilePicker.returnFiles = [file];
-
-    await BrowserOpenAddonsMgr("addons://list/extension");
-    let contentWin = gBrowser.selectedTab.linkedBrowser.contentWindow;
-
-    // Do the install...
-    contentWin.gViewController.doCommand("cmd_installFromFile");
-    MockFilePicker.cleanup();
-  },
-
-  async function installSearch(filename) {
-    await SpecialPowers.pushPrefEnv({set: [
-      ["extensions.getAddons.maxResults", 10],
-      ["extensions.getAddons.search.url", `${BASE}/browser_webext_search.xml`],
-    ]});
-
-    let win = await BrowserOpenAddonsMgr("addons://list/extension");
-
-    let searchResultsPromise = new Promise(resolve => {
-      win.document.addEventListener("ViewChanged", resolve, {once: true});
-    });
-    let search = win.document.getElementById("header-search");
-    search.focus();
-    search.value = "search text";
-    EventUtils.synthesizeKey("VK_RETURN", {}, win);
-
-    await searchResultsPromise;
-    ok(win.gViewController.currentViewId.startsWith("addons://search"),
-       "about:addons is displaying search results");
-
-    let list = win.document.getElementById("search-list");
-    let item = null;
-    for (let child of list.childNodes) {
-      if (child.nodeName == "richlistitem" &&
-          child.mAddon.install.sourceURI.path.endsWith(filename)) {
-            item = child;
-            break;
-      }
-    }
-    ok(item, `Found ${filename} in search results`);
-
-    // abracadabara XBL
-    item.clientTop;
-
-    let install = win.document.getAnonymousElementByAttribute(item, "anonid", "install-status");
-    let button = win.document.getAnonymousElementByAttribute(install, "anonid", "install-remote-btn");
-    EventUtils.synthesizeMouseAtCenter(button, {}, win);
-  },
-];
-
-add_task(function* () {
-  yield SpecialPowers.pushPrefEnv({set: [
-    ["extensions.webapi.testing", true],
-    ["extensions.install.requireBuiltInCerts", false],
-
-    // XXX remove this when prompts are enabled by default
-    ["extensions.webextPermissionPrompts", true],
-  ]});
-
-  function* runOnce(installFn, filename, cancel) {
-    let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-    let installPromise = new Promise(resolve => {
-      let listener = {
-        onDownloadCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onDownloadFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallEnded() {
-          AddonManager.removeInstallListener(listener);
-          resolve(true);
-        },
-
-        onInstallFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-      };
-      AddonManager.addInstallListener(listener);
-    });
-
-    let installMethodPromise = installFn(filename);
-
-    let panel = yield promisePopupNotificationShown("addon-webext-permissions");
-    checkNotification(panel, filename);
-
-    if (cancel) {
-      panel.secondaryButton.click();
-      try {
-        yield installMethodPromise;
-      } catch (err) {}
-    } else {
-      // Look for post-install notification
-      let postInstallPromise = promisePopupNotificationShown("addon-installed");
-      panel.button.click();
-
-      // Press OK on the post-install notification
-      panel = yield postInstallPromise;
-      panel.button.click();
-
-      yield installMethodPromise;
-    }
-
-    let result = yield installPromise;
-    let addon = yield AddonManager.getAddonByID(ID);
-    if (cancel) {
-      ok(!result, "Installation was cancelled");
-      is(addon, null, "Extension is not installed");
-    } else {
-      ok(result, "Installation completed");
-      isnot(addon, null, "Extension is installed");
-      addon.uninstall();
-    }
-
-    yield BrowserTestUtils.removeTab(tab);
-  }
-
-  for (let installFn of INSTALL_FUNCTIONS) {
-    yield runOnce(installFn, NO_PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, false);
-  }
-});
+add_task(() => testInstallMethod(installSearch));
copy from browser/base/content/test/webextensions/browser_extension_permissions.js
copy to browser/base/content/test/webextensions/browser_permissions_installTrigger.js
--- a/browser/base/content/test/webextensions/browser_extension_permissions.js
+++ b/browser/base/content/test/webextensions/browser_permissions_installTrigger.js
@@ -1,215 +1,14 @@
 "use strict";
 
-// See but 1340586 for proposal to reorganize permissions tests to
-// get rid of this...
-requestLongerTimeout(2);
-
 const INSTALL_PAGE = `${BASE}/file_install_extensions.html`;
-const PERMS_XPI = "browser_webext_permissions.xpi";
-const NO_PERMS_XPI = "browser_webext_nopermissions.xpi";
-const ID = "permissions@test.mozilla.org";
-
-Services.perms.add(makeURI("https://example.com/"), "install",
-                   Services.perms.ALLOW_ACTION);
-
-function isDefaultIcon(icon) {
-  // These are basically the same icon, but code within webextensions
-  // generates references to the former and generic add-ons manager code
-  // generates referces to the latter.
-  return (icon == "chrome://browser/content/extension.svg" ||
-          icon == "chrome://mozapps/skin/extensions/extensionGeneric.svg");
-}
-
-function checkNotification(panel, filename) {
-  let icon = panel.getAttribute("icon");
-
-  let ul = document.getElementById("addon-webext-perm-list");
-  let header = document.getElementById("addon-webext-perm-intro");
 
-  if (filename == PERMS_XPI) {
-    // The icon should come from the extension, don't bother with the precise
-    // path, just make sure we've got a jar url pointing to the right path
-    // inside the jar.
-    ok(icon.startsWith("jar:file://"), "Icon is a jar url");
-    ok(icon.endsWith("/icon.png"), "Icon is icon.png inside a jar");
+async function installTrigger(filename) {
+  gBrowser.selectedBrowser.loadURI(INSTALL_PAGE);
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
-    is(header.getAttribute("hidden"), "", "Permission list header is visible");
-    is(ul.childElementCount, 5, "Permissions list has 5 entries");
-    // Real checking of the contents here is deferred until bug 1316996 lands
-  } else if (filename == NO_PERMS_XPI) {
-    // This extension has no icon, it should have the default
-    ok(isDefaultIcon(icon), "Icon is the default extension icon");
-
-    is(header.getAttribute("hidden"), "true", "Permission list header is hidden");
-    is(ul.childElementCount, 0, "Permissions list has 0 entries");
-  }
-}
-
-// Navigate the current tab to the given url and return a Promise
-// that resolves when the page is loaded.
-function load(url) {
-  gBrowser.selectedBrowser.loadURI(INSTALL_PAGE);
-  return BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
+    content.wrappedJSObject.installTrigger(url);
+  });
 }
 
-const INSTALL_FUNCTIONS = [
-  async function installMozAM(filename) {
-    await load(INSTALL_PAGE);
-
-    await ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      yield content.wrappedJSObject.installMozAM(url);
-    });
-  },
-
-  async function installTrigger(filename) {
-    await load(INSTALL_PAGE);
-
-    ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      content.wrappedJSObject.installTrigger(url);
-    });
-  },
-
-  async function installFile(filename) {
-    const ChromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"]
-                                       .getService(Ci.nsIChromeRegistry);
-    let chromeUrl = Services.io.newURI(gTestPath);
-    let fileUrl = ChromeRegistry.convertChromeURL(chromeUrl);
-    let file = fileUrl.QueryInterface(Ci.nsIFileURL).file;
-    file.leafName = filename;
-
-    let MockFilePicker = SpecialPowers.MockFilePicker;
-    MockFilePicker.init(window);
-    MockFilePicker.returnFiles = [file];
-
-    await BrowserOpenAddonsMgr("addons://list/extension");
-    let contentWin = gBrowser.selectedTab.linkedBrowser.contentWindow;
-
-    // Do the install...
-    contentWin.gViewController.doCommand("cmd_installFromFile");
-    MockFilePicker.cleanup();
-  },
-
-  async function installSearch(filename) {
-    await SpecialPowers.pushPrefEnv({set: [
-      ["extensions.getAddons.maxResults", 10],
-      ["extensions.getAddons.search.url", `${BASE}/browser_webext_search.xml`],
-    ]});
-
-    let win = await BrowserOpenAddonsMgr("addons://list/extension");
-
-    let searchResultsPromise = new Promise(resolve => {
-      win.document.addEventListener("ViewChanged", resolve, {once: true});
-    });
-    let search = win.document.getElementById("header-search");
-    search.focus();
-    search.value = "search text";
-    EventUtils.synthesizeKey("VK_RETURN", {}, win);
-
-    await searchResultsPromise;
-    ok(win.gViewController.currentViewId.startsWith("addons://search"),
-       "about:addons is displaying search results");
-
-    let list = win.document.getElementById("search-list");
-    let item = null;
-    for (let child of list.childNodes) {
-      if (child.nodeName == "richlistitem" &&
-          child.mAddon.install.sourceURI.path.endsWith(filename)) {
-            item = child;
-            break;
-      }
-    }
-    ok(item, `Found ${filename} in search results`);
-
-    // abracadabara XBL
-    item.clientTop;
-
-    let install = win.document.getAnonymousElementByAttribute(item, "anonid", "install-status");
-    let button = win.document.getAnonymousElementByAttribute(install, "anonid", "install-remote-btn");
-    EventUtils.synthesizeMouseAtCenter(button, {}, win);
-  },
-];
-
-add_task(function* () {
-  yield SpecialPowers.pushPrefEnv({set: [
-    ["extensions.webapi.testing", true],
-    ["extensions.install.requireBuiltInCerts", false],
-
-    // XXX remove this when prompts are enabled by default
-    ["extensions.webextPermissionPrompts", true],
-  ]});
-
-  function* runOnce(installFn, filename, cancel) {
-    let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-    let installPromise = new Promise(resolve => {
-      let listener = {
-        onDownloadCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onDownloadFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallEnded() {
-          AddonManager.removeInstallListener(listener);
-          resolve(true);
-        },
-
-        onInstallFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-      };
-      AddonManager.addInstallListener(listener);
-    });
-
-    let installMethodPromise = installFn(filename);
-
-    let panel = yield promisePopupNotificationShown("addon-webext-permissions");
-    checkNotification(panel, filename);
-
-    if (cancel) {
-      panel.secondaryButton.click();
-      try {
-        yield installMethodPromise;
-      } catch (err) {}
-    } else {
-      // Look for post-install notification
-      let postInstallPromise = promisePopupNotificationShown("addon-installed");
-      panel.button.click();
-
-      // Press OK on the post-install notification
-      panel = yield postInstallPromise;
-      panel.button.click();
-
-      yield installMethodPromise;
-    }
-
-    let result = yield installPromise;
-    let addon = yield AddonManager.getAddonByID(ID);
-    if (cancel) {
-      ok(!result, "Installation was cancelled");
-      is(addon, null, "Extension is not installed");
-    } else {
-      ok(result, "Installation completed");
-      isnot(addon, null, "Extension is installed");
-      addon.uninstall();
-    }
-
-    yield BrowserTestUtils.removeTab(tab);
-  }
-
-  for (let installFn of INSTALL_FUNCTIONS) {
-    yield runOnce(installFn, NO_PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, false);
-  }
-});
+add_task(() => testInstallMethod(installTrigger));
copy from browser/base/content/test/webextensions/browser_extension_permissions.js
copy to browser/base/content/test/webextensions/browser_permissions_local_file.js
--- a/browser/base/content/test/webextensions/browser_extension_permissions.js
+++ b/browser/base/content/test/webextensions/browser_permissions_local_file.js
@@ -1,215 +1,23 @@
 "use strict";
 
-// See but 1340586 for proposal to reorganize permissions tests to
-// get rid of this...
-requestLongerTimeout(2);
-
-const INSTALL_PAGE = `${BASE}/file_install_extensions.html`;
-const PERMS_XPI = "browser_webext_permissions.xpi";
-const NO_PERMS_XPI = "browser_webext_nopermissions.xpi";
-const ID = "permissions@test.mozilla.org";
-
-Services.perms.add(makeURI("https://example.com/"), "install",
-                   Services.perms.ALLOW_ACTION);
-
-function isDefaultIcon(icon) {
-  // These are basically the same icon, but code within webextensions
-  // generates references to the former and generic add-ons manager code
-  // generates referces to the latter.
-  return (icon == "chrome://browser/content/extension.svg" ||
-          icon == "chrome://mozapps/skin/extensions/extensionGeneric.svg");
-}
-
-function checkNotification(panel, filename) {
-  let icon = panel.getAttribute("icon");
+async function installFile(filename) {
+  const ChromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"]
+                                     .getService(Ci.nsIChromeRegistry);
+  let chromeUrl = Services.io.newURI(gTestPath);
+  let fileUrl = ChromeRegistry.convertChromeURL(chromeUrl);
+  let file = fileUrl.QueryInterface(Ci.nsIFileURL).file;
+  file.leafName = filename;
 
-  let ul = document.getElementById("addon-webext-perm-list");
-  let header = document.getElementById("addon-webext-perm-intro");
-
-  if (filename == PERMS_XPI) {
-    // The icon should come from the extension, don't bother with the precise
-    // path, just make sure we've got a jar url pointing to the right path
-    // inside the jar.
-    ok(icon.startsWith("jar:file://"), "Icon is a jar url");
-    ok(icon.endsWith("/icon.png"), "Icon is icon.png inside a jar");
+  let MockFilePicker = SpecialPowers.MockFilePicker;
+  MockFilePicker.init(window);
+  MockFilePicker.returnFiles = [file];
 
-    is(header.getAttribute("hidden"), "", "Permission list header is visible");
-    is(ul.childElementCount, 5, "Permissions list has 5 entries");
-    // Real checking of the contents here is deferred until bug 1316996 lands
-  } else if (filename == NO_PERMS_XPI) {
-    // This extension has no icon, it should have the default
-    ok(isDefaultIcon(icon), "Icon is the default extension icon");
+  await BrowserOpenAddonsMgr("addons://list/extension");
+  let contentWin = gBrowser.selectedTab.linkedBrowser.contentWindow;
 
-    is(header.getAttribute("hidden"), "true", "Permission list header is hidden");
-    is(ul.childElementCount, 0, "Permissions list has 0 entries");
-  }
-}
-
-// Navigate the current tab to the given url and return a Promise
-// that resolves when the page is loaded.
-function load(url) {
-  gBrowser.selectedBrowser.loadURI(INSTALL_PAGE);
-  return BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  // Do the install...
+  contentWin.gViewController.doCommand("cmd_installFromFile");
+  MockFilePicker.cleanup();
 }
 
-const INSTALL_FUNCTIONS = [
-  async function installMozAM(filename) {
-    await load(INSTALL_PAGE);
-
-    await ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      yield content.wrappedJSObject.installMozAM(url);
-    });
-  },
-
-  async function installTrigger(filename) {
-    await load(INSTALL_PAGE);
-
-    ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      content.wrappedJSObject.installTrigger(url);
-    });
-  },
-
-  async function installFile(filename) {
-    const ChromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"]
-                                       .getService(Ci.nsIChromeRegistry);
-    let chromeUrl = Services.io.newURI(gTestPath);
-    let fileUrl = ChromeRegistry.convertChromeURL(chromeUrl);
-    let file = fileUrl.QueryInterface(Ci.nsIFileURL).file;
-    file.leafName = filename;
-
-    let MockFilePicker = SpecialPowers.MockFilePicker;
-    MockFilePicker.init(window);
-    MockFilePicker.returnFiles = [file];
-
-    await BrowserOpenAddonsMgr("addons://list/extension");
-    let contentWin = gBrowser.selectedTab.linkedBrowser.contentWindow;
-
-    // Do the install...
-    contentWin.gViewController.doCommand("cmd_installFromFile");
-    MockFilePicker.cleanup();
-  },
-
-  async function installSearch(filename) {
-    await SpecialPowers.pushPrefEnv({set: [
-      ["extensions.getAddons.maxResults", 10],
-      ["extensions.getAddons.search.url", `${BASE}/browser_webext_search.xml`],
-    ]});
-
-    let win = await BrowserOpenAddonsMgr("addons://list/extension");
-
-    let searchResultsPromise = new Promise(resolve => {
-      win.document.addEventListener("ViewChanged", resolve, {once: true});
-    });
-    let search = win.document.getElementById("header-search");
-    search.focus();
-    search.value = "search text";
-    EventUtils.synthesizeKey("VK_RETURN", {}, win);
-
-    await searchResultsPromise;
-    ok(win.gViewController.currentViewId.startsWith("addons://search"),
-       "about:addons is displaying search results");
-
-    let list = win.document.getElementById("search-list");
-    let item = null;
-    for (let child of list.childNodes) {
-      if (child.nodeName == "richlistitem" &&
-          child.mAddon.install.sourceURI.path.endsWith(filename)) {
-            item = child;
-            break;
-      }
-    }
-    ok(item, `Found ${filename} in search results`);
-
-    // abracadabara XBL
-    item.clientTop;
-
-    let install = win.document.getAnonymousElementByAttribute(item, "anonid", "install-status");
-    let button = win.document.getAnonymousElementByAttribute(install, "anonid", "install-remote-btn");
-    EventUtils.synthesizeMouseAtCenter(button, {}, win);
-  },
-];
-
-add_task(function* () {
-  yield SpecialPowers.pushPrefEnv({set: [
-    ["extensions.webapi.testing", true],
-    ["extensions.install.requireBuiltInCerts", false],
-
-    // XXX remove this when prompts are enabled by default
-    ["extensions.webextPermissionPrompts", true],
-  ]});
-
-  function* runOnce(installFn, filename, cancel) {
-    let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-    let installPromise = new Promise(resolve => {
-      let listener = {
-        onDownloadCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onDownloadFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallEnded() {
-          AddonManager.removeInstallListener(listener);
-          resolve(true);
-        },
-
-        onInstallFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-      };
-      AddonManager.addInstallListener(listener);
-    });
-
-    let installMethodPromise = installFn(filename);
-
-    let panel = yield promisePopupNotificationShown("addon-webext-permissions");
-    checkNotification(panel, filename);
-
-    if (cancel) {
-      panel.secondaryButton.click();
-      try {
-        yield installMethodPromise;
-      } catch (err) {}
-    } else {
-      // Look for post-install notification
-      let postInstallPromise = promisePopupNotificationShown("addon-installed");
-      panel.button.click();
-
-      // Press OK on the post-install notification
-      panel = yield postInstallPromise;
-      panel.button.click();
-
-      yield installMethodPromise;
-    }
-
-    let result = yield installPromise;
-    let addon = yield AddonManager.getAddonByID(ID);
-    if (cancel) {
-      ok(!result, "Installation was cancelled");
-      is(addon, null, "Extension is not installed");
-    } else {
-      ok(result, "Installation completed");
-      isnot(addon, null, "Extension is installed");
-      addon.uninstall();
-    }
-
-    yield BrowserTestUtils.removeTab(tab);
-  }
-
-  for (let installFn of INSTALL_FUNCTIONS) {
-    yield runOnce(installFn, NO_PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, false);
-  }
-});
+add_task(() => testInstallMethod(installFile));
copy from browser/base/content/test/webextensions/browser_extension_permissions.js
copy to browser/base/content/test/webextensions/browser_permissions_mozAddonManager.js
--- a/browser/base/content/test/webextensions/browser_extension_permissions.js
+++ b/browser/base/content/test/webextensions/browser_permissions_mozAddonManager.js
@@ -1,215 +1,14 @@
 "use strict";
 
-// See but 1340586 for proposal to reorganize permissions tests to
-// get rid of this...
-requestLongerTimeout(2);
-
 const INSTALL_PAGE = `${BASE}/file_install_extensions.html`;
-const PERMS_XPI = "browser_webext_permissions.xpi";
-const NO_PERMS_XPI = "browser_webext_nopermissions.xpi";
-const ID = "permissions@test.mozilla.org";
-
-Services.perms.add(makeURI("https://example.com/"), "install",
-                   Services.perms.ALLOW_ACTION);
-
-function isDefaultIcon(icon) {
-  // These are basically the same icon, but code within webextensions
-  // generates references to the former and generic add-ons manager code
-  // generates referces to the latter.
-  return (icon == "chrome://browser/content/extension.svg" ||
-          icon == "chrome://mozapps/skin/extensions/extensionGeneric.svg");
-}
-
-function checkNotification(panel, filename) {
-  let icon = panel.getAttribute("icon");
-
-  let ul = document.getElementById("addon-webext-perm-list");
-  let header = document.getElementById("addon-webext-perm-intro");
 
-  if (filename == PERMS_XPI) {
-    // The icon should come from the extension, don't bother with the precise
-    // path, just make sure we've got a jar url pointing to the right path
-    // inside the jar.
-    ok(icon.startsWith("jar:file://"), "Icon is a jar url");
-    ok(icon.endsWith("/icon.png"), "Icon is icon.png inside a jar");
+async function installMozAM(filename) {
+  gBrowser.selectedBrowser.loadURI(INSTALL_PAGE);
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
-    is(header.getAttribute("hidden"), "", "Permission list header is visible");
-    is(ul.childElementCount, 5, "Permissions list has 5 entries");
-    // Real checking of the contents here is deferred until bug 1316996 lands
-  } else if (filename == NO_PERMS_XPI) {
-    // This extension has no icon, it should have the default
-    ok(isDefaultIcon(icon), "Icon is the default extension icon");
-
-    is(header.getAttribute("hidden"), "true", "Permission list header is hidden");
-    is(ul.childElementCount, 0, "Permissions list has 0 entries");
-  }
-}
-
-// Navigate the current tab to the given url and return a Promise
-// that resolves when the page is loaded.
-function load(url) {
-  gBrowser.selectedBrowser.loadURI(INSTALL_PAGE);
-  return BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  await ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
+    yield content.wrappedJSObject.installMozAM(url);
+  });
 }
 
-const INSTALL_FUNCTIONS = [
-  async function installMozAM(filename) {
-    await load(INSTALL_PAGE);
-
-    await ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      yield content.wrappedJSObject.installMozAM(url);
-    });
-  },
-
-  async function installTrigger(filename) {
-    await load(INSTALL_PAGE);
-
-    ContentTask.spawn(gBrowser.selectedBrowser, `${BASE}/${filename}`, function*(url) {
-      content.wrappedJSObject.installTrigger(url);
-    });
-  },
-
-  async function installFile(filename) {
-    const ChromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"]
-                                       .getService(Ci.nsIChromeRegistry);
-    let chromeUrl = Services.io.newURI(gTestPath);
-    let fileUrl = ChromeRegistry.convertChromeURL(chromeUrl);
-    let file = fileUrl.QueryInterface(Ci.nsIFileURL).file;
-    file.leafName = filename;
-
-    let MockFilePicker = SpecialPowers.MockFilePicker;
-    MockFilePicker.init(window);
-    MockFilePicker.returnFiles = [file];
-
-    await BrowserOpenAddonsMgr("addons://list/extension");
-    let contentWin = gBrowser.selectedTab.linkedBrowser.contentWindow;
-
-    // Do the install...
-    contentWin.gViewController.doCommand("cmd_installFromFile");
-    MockFilePicker.cleanup();
-  },
-
-  async function installSearch(filename) {
-    await SpecialPowers.pushPrefEnv({set: [
-      ["extensions.getAddons.maxResults", 10],
-      ["extensions.getAddons.search.url", `${BASE}/browser_webext_search.xml`],
-    ]});
-
-    let win = await BrowserOpenAddonsMgr("addons://list/extension");
-
-    let searchResultsPromise = new Promise(resolve => {
-      win.document.addEventListener("ViewChanged", resolve, {once: true});
-    });
-    let search = win.document.getElementById("header-search");
-    search.focus();
-    search.value = "search text";
-    EventUtils.synthesizeKey("VK_RETURN", {}, win);
-
-    await searchResultsPromise;
-    ok(win.gViewController.currentViewId.startsWith("addons://search"),
-       "about:addons is displaying search results");
-
-    let list = win.document.getElementById("search-list");
-    let item = null;
-    for (let child of list.childNodes) {
-      if (child.nodeName == "richlistitem" &&
-          child.mAddon.install.sourceURI.path.endsWith(filename)) {
-            item = child;
-            break;
-      }
-    }
-    ok(item, `Found ${filename} in search results`);
-
-    // abracadabara XBL
-    item.clientTop;
-
-    let install = win.document.getAnonymousElementByAttribute(item, "anonid", "install-status");
-    let button = win.document.getAnonymousElementByAttribute(install, "anonid", "install-remote-btn");
-    EventUtils.synthesizeMouseAtCenter(button, {}, win);
-  },
-];
-
-add_task(function* () {
-  yield SpecialPowers.pushPrefEnv({set: [
-    ["extensions.webapi.testing", true],
-    ["extensions.install.requireBuiltInCerts", false],
-
-    // XXX remove this when prompts are enabled by default
-    ["extensions.webextPermissionPrompts", true],
-  ]});
-
-  function* runOnce(installFn, filename, cancel) {
-    let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-    let installPromise = new Promise(resolve => {
-      let listener = {
-        onDownloadCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onDownloadFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallCancelled() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-
-        onInstallEnded() {
-          AddonManager.removeInstallListener(listener);
-          resolve(true);
-        },
-
-        onInstallFailed() {
-          AddonManager.removeInstallListener(listener);
-          resolve(false);
-        },
-      };
-      AddonManager.addInstallListener(listener);
-    });
-
-    let installMethodPromise = installFn(filename);
-
-    let panel = yield promisePopupNotificationShown("addon-webext-permissions");
-    checkNotification(panel, filename);
-
-    if (cancel) {
-      panel.secondaryButton.click();
-      try {
-        yield installMethodPromise;
-      } catch (err) {}
-    } else {
-      // Look for post-install notification
-      let postInstallPromise = promisePopupNotificationShown("addon-installed");
-      panel.button.click();
-
-      // Press OK on the post-install notification
-      panel = yield postInstallPromise;
-      panel.button.click();
-
-      yield installMethodPromise;
-    }
-
-    let result = yield installPromise;
-    let addon = yield AddonManager.getAddonByID(ID);
-    if (cancel) {
-      ok(!result, "Installation was cancelled");
-      is(addon, null, "Extension is not installed");
-    } else {
-      ok(result, "Installation completed");
-      isnot(addon, null, "Extension is installed");
-      addon.uninstall();
-    }
-
-    yield BrowserTestUtils.removeTab(tab);
-  }
-
-  for (let installFn of INSTALL_FUNCTIONS) {
-    yield runOnce(installFn, NO_PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, true);
-    yield runOnce(installFn, PERMS_XPI, false);
-  }
-});
+add_task(() => testInstallMethod(installMozAM));