Bug 1543710 - Do not run devtools extension tests in non-oop r=rpl

Depends on D34627

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

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

browser/components/extensions/test/browser/browser-common.ini

@@ -5,7 +5,6 @@ prefs =
 support-files =
   silence.ogg
   head_browserAction.js
-  head_devtools.js
   head_pageAction.js
   head_sessions.js
   head_webNavigation.js
@@ -26,7 +25,6 @@ support-files =
   file_language_tlh.html
   file_dummy.html
   file_title.html
-  file_inspectedwindow_reload_target.sjs
   file_indexedDB.html
   file_serviceWorker.html
   install_other-1.0-fx.xpi
@@ -96,17 +94,6 @@ support-files = !/browser/components/places/tests/browser/head.js
 [browser_ext_contextMenus_uninstall.js]
 [browser_ext_contextMenus_urlPatterns.js]
 [browser_ext_currentWindow.js]
-[browser_ext_devtools_inspectedWindow.js]
-[browser_ext_devtools_inspectedWindow_eval_bindings.js]
-[browser_ext_devtools_inspectedWindow_reload.js]
-[browser_ext_devtools_network.js]
-[browser_ext_devtools_page.js]
-[browser_ext_devtools_page_incognito.js]
-[browser_ext_devtools_panel.js]
-[browser_ext_devtools_panels_elements.js]
-[browser_ext_devtools_panels_elements_sidebar.js]
-support-files =
-  ../../../../../devtools/client/inspector/extensions/test/head_devtools_inspector_sidebar.js
 [browser_ext_find.js]
 skip-if = (verify && (os == 'linux' || os == 'mac'))
 [browser_ext_getViews.js]

browser/components/extensions/test/browser/browser-remote.ini

@@ -10,8 +10,21 @@ tags = webextensions remote-webextensions
 skip-if = !e10s
 support-files =
   head.js
+  head_devtools.js
+  file_inspectedwindow_reload_target.sjs
 
 [browser_ext_contentscript_nontab_connect.js]
+[browser_ext_devtools_inspectedWindow.js]
+[browser_ext_devtools_inspectedWindow_eval_bindings.js]
+[browser_ext_devtools_inspectedWindow_reload.js]
+[browser_ext_devtools_network.js]
+[browser_ext_devtools_page.js]
+[browser_ext_devtools_page_incognito.js]
+[browser_ext_devtools_panel.js]
+[browser_ext_devtools_panels_elements.js]
+[browser_ext_devtools_panels_elements_sidebar.js]
+support-files =
+  ../../../../../devtools/client/inspector/extensions/test/head_devtools_inspector_sidebar.js
 [browser_ext_optionsPage_popups.js]
 [browser_ext_popup_select.js]
 skip-if = debug || os != 'win' # FIXME: re-enable on debug build (bug 1442822)

browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js

@@ -11,7 +11,7 @@ loadTestSubscript("head_devtools.js");
 // Small helper which provides the common steps to the following reload test cases.
 async function runReloadTestCase({urlParams, background, devtoolsPage, testCase}) {
   const BASE = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/";
-  const TEST_TARGET_URL = `${BASE}file_inspectedwindow_reload_target.sjs?${urlParams}`;
+  const TEST_TARGET_URL = `${BASE}/test-oop-extensions/file_inspectedwindow_reload_target.sjs?${urlParams}`;
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_TARGET_URL);
 
   let extension = ExtensionTestUtils.loadExtension({