Bug 1500383 - Fix conflicts between bugs 857456 and 1510620;r=daisuke

Depends on D15465

Some leftovers from previous bugs

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

--HG--
extra : moz-landing-system : lando

devtools/client/aboutdebugging/test/browser_addons_reload.js

@@ -59,8 +59,6 @@ class TempWebExt {
   }
 }
 
-// Remove in Bug 1497264
-/*
 add_task(async function reloadButtonReloadsAddon() {
   const ADDON_NAME = "test-devtools";
   const { tab, document, window } = await openAboutDebugging("addons");
@@ -94,7 +92,6 @@ add_task(async function reloadButtonReloadsAddon() {
   await tearDownAddon(AboutDebugging, reloadedAddon);
   await closeAboutDebugging(tab);
 });
-*/
 
 add_task(async function reloadButtonRefreshesMetadata() {
   const { tab, document, window } = await openAboutDebugging("addons");

devtools/client/shared/test/browser.ini

@@ -243,9 +243,7 @@ skip-if = !e10s || os == "win" # RDM only works for remote tabs, Win: bug 140419
 skip-if = verify
 [browser_theme_switching.js]
 [browser_dbg_listaddons.js]
-# To be removed or updated in bug 1497264
-# previously was: e10s && debug
-skip-if = true
+skip-if = e10s && debug
 tags = addons
 [browser_dbg_listtabs-01.js]
 [browser_dbg_listtabs-02.js]