diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index d4996e3f553e..238623f08907 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -31,7 +31,6 @@ browser/chrome/devtools/content/inspector/fonts/fonts.js browser/chrome/devtools/content/inspector/inspector.xhtml browser/chrome/devtools/content/memory/initializer.js browser/chrome/devtools/content/projecteditor/lib/helpers/readdir.js -browser/chrome/devtools/content/shared/frame-script-utils.js browser/chrome/devtools/content/shared/theme-switching.js browser/chrome/devtools/modules/devtools/client/dom/content/dom-view.css browser/chrome/devtools/modules/devtools/client/dom/dom.html @@ -43,7 +42,6 @@ browser/chrome/devtools/modules/devtools/client/jsonview/css/controls.png browser/chrome/devtools/modules/devtools/client/jsonview/css/controls@2x.png browser/chrome/devtools/modules/devtools/client/memory/initializer.js browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdir.js -browser/chrome/devtools/modules/devtools/client/shared/frame-script-utils.js browser/chrome/devtools/modules/devtools/client/shared/theme-switching.js browser/chrome/devtools/modules/devtools/client/themes/common.css browser/chrome/devtools/modules/devtools/client/themes/toolbars.css diff --git a/devtools/client/animationinspector/test/browser.ini b/devtools/client/animationinspector/test/browser.ini index 17ee11e96992..78be9c666eba 100644 --- a/devtools/client/animationinspector/test/browser.ini +++ b/devtools/client/animationinspector/test/browser.ini @@ -22,6 +22,7 @@ support-files = !/devtools/client/commandline/test/helpers.js !/devtools/client/inspector/test/head.js !/devtools/client/inspector/test/shared-head.js + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js !/devtools/client/shared/test/test-actor-registry.js !/devtools/client/shared/test/test-actor.js diff --git a/devtools/client/canvasdebugger/test/browser.ini b/devtools/client/canvasdebugger/test/browser.ini index b19d886ebad8..6ae0351b942a 100644 --- a/devtools/client/canvasdebugger/test/browser.ini +++ b/devtools/client/canvasdebugger/test/browser.ini @@ -15,6 +15,7 @@ support-files = doc_webgl-drawArrays.html doc_webgl-drawElements.html head.js + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js [browser_canvas-actor-test-01.js] diff --git a/devtools/client/dom/test/browser.ini b/devtools/client/dom/test/browser.ini index dabf0140337b..66c4ae680d53 100644 --- a/devtools/client/dom/test/browser.ini +++ b/devtools/client/dom/test/browser.ini @@ -5,6 +5,7 @@ support-files = head.js page_array.html page_basic.html + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js [browser_dom_array.js] diff --git a/devtools/client/dom/test/head.js b/devtools/client/dom/test/head.js index 5cf0eb414ab0..781441b065d4 100644 --- a/devtools/client/dom/test/head.js +++ b/devtools/client/dom/test/head.js @@ -37,7 +37,7 @@ function addTestTab(url) { return new Promise(resolve => { addTab(url).then(tab => { - // Load devtools/shared/frame-script-utils.js + // Load devtools/shared/test/frame-script-utils.js loadFrameScriptUtils(); // Select the DOM panel and wait till it's initialized. diff --git a/devtools/client/framework/test/browser.ini b/devtools/client/framework/test/browser.ini index 94aff3b31411..7a5e6c1d9955 100644 --- a/devtools/client/framework/test/browser.ini +++ b/devtools/client/framework/test/browser.ini @@ -44,6 +44,7 @@ support-files = sjs_code_bundle_reload_map.sjs test_browser_toolbox_debugger.js !/devtools/client/debugger/new/test/mochitest/head.js + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js !/devtools/client/shared/test/shared-redux-head.js diff --git a/devtools/client/inspector/animation/test/browser.ini b/devtools/client/inspector/animation/test/browser.ini index 9b07c666a169..3c88432d97e4 100644 --- a/devtools/client/inspector/animation/test/browser.ini +++ b/devtools/client/inspector/animation/test/browser.ini @@ -9,6 +9,7 @@ support-files = head.js !/devtools/client/inspector/test/head.js !/devtools/client/inspector/test/shared-head.js + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js !/devtools/client/shared/test/test-actor-registry.js !/devtools/client/shared/test/test-actor.js diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index 975f0e7c34e2..628a9eb25bf4 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -15,7 +15,6 @@ devtools.jar: content/scratchpad/scratchpad.js (scratchpad/scratchpad.js) content/shared/splitview.css (shared/splitview.css) content/shared/theme-switching.js (shared/theme-switching.js) - content/shared/frame-script-utils.js (shared/frame-script-utils.js) * content/styleeditor/styleeditor.xul (styleeditor/styleeditor.xul) * content/storage/storage.xul (storage/storage.xul) content/inspector/inspector.js (inspector/inspector.js) diff --git a/devtools/client/jsonview/test/browser.ini b/devtools/client/jsonview/test/browser.ini index 66197de0863b..1b21d1fd964a 100644 --- a/devtools/client/jsonview/test/browser.ini +++ b/devtools/client/jsonview/test/browser.ini @@ -20,6 +20,7 @@ support-files = valid_json.json^headers^ !/devtools/client/commandline/test/head.js !/devtools/client/framework/test/head.js + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js [browser_json_refresh.js] diff --git a/devtools/client/jsonview/test/head.js b/devtools/client/jsonview/test/head.js index 4305f72a5111..ad2a2cd64eb4 100644 --- a/devtools/client/jsonview/test/head.js +++ b/devtools/client/jsonview/test/head.js @@ -65,7 +65,7 @@ async function addJsonViewTab(url, { }, Ci.nsIWebProgress.NOTIFY_LOCATION); })]); - // Load devtools/shared/frame-script-utils.js + // Load devtools/shared/test/frame-script-utils.js loadFrameScriptUtils(); let rootDir = getRootDirectory(gTestPath); diff --git a/devtools/client/netmonitor/test/browser.ini b/devtools/client/netmonitor/test/browser.ini index c3dabf1ad4b0..3121697e6341 100644 --- a/devtools/client/netmonitor/test/browser.ini +++ b/devtools/client/netmonitor/test/browser.ini @@ -52,10 +52,11 @@ support-files = test-image.png service-workers/status-codes.html service-workers/status-codes-service-worker.js - !/devtools/client/shared/test/shared-head.js xhr_bundle.js xhr_bundle.js.map xhr_original.js + !/devtools/client/shared/test/frame-script-utils.js + !/devtools/client/shared/test/shared-head.js [browser_net_accessibility-01.js] [browser_net_accessibility-02.js] diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonitor/test/head.js index 4641a0c43dbb..a57063542f59 100644 --- a/devtools/client/netmonitor/test/head.js +++ b/devtools/client/netmonitor/test/head.js @@ -621,7 +621,7 @@ function testFilterButtonsCustom(monitor, isChecked) { * * @param Array requests * An array of objects specifying the requests to perform. See - * shared/frame-script-utils.js for more information. + * shared/test/frame-script-utils.js for more information. * * @return A promise that resolves once the requests complete. */ @@ -636,7 +636,7 @@ function performRequestsInContent(requests) { * * @param String name * The message name. Should be one of the messages defined - * shared/frame-script-utils.js + * shared/test/frame-script-utils.js * @param Object data * Optional data to send along * @param Object objects diff --git a/devtools/client/performance/test/browser.ini b/devtools/client/performance/test/browser.ini index 23354e59efa4..0ecfeefd9ef2 100644 --- a/devtools/client/performance/test/browser.ini +++ b/devtools/client/performance/test/browser.ini @@ -10,6 +10,7 @@ support-files = doc_worker.html js_simpleWorker.js head.js + !/devtools/client/shared/test/frame-script-utils.js [browser_aaa-run-first-leaktest.js] [browser_perf-button-states.js] diff --git a/devtools/client/performance/test/helpers/profiler-mm-utils.js b/devtools/client/performance/test/helpers/profiler-mm-utils.js index bffebf818458..4718115d452e 100644 --- a/devtools/client/performance/test/helpers/profiler-mm-utils.js +++ b/devtools/client/performance/test/helpers/profiler-mm-utils.js @@ -12,7 +12,7 @@ const { Cc, Ci } = require("chrome"); const { Task } = require("devtools/shared/task"); -const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js"; +const FRAME_SCRIPT_UTILS_URL = "chrome://mochitests/content/browser/devtools/client/shared/test/frame-script-utils.js"; let gMM = null; diff --git a/devtools/client/shadereditor/test/browser.ini b/devtools/client/shadereditor/test/browser.ini index 628ad328041b..3a0e0ee1b487 100644 --- a/devtools/client/shadereditor/test/browser.ini +++ b/devtools/client/shadereditor/test/browser.ini @@ -8,6 +8,7 @@ support-files = doc_shader-order.html doc_simple-canvas.html head.js + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js [browser_se_aaa_run_first_leaktest.js] diff --git a/devtools/client/shared/test/browser.ini b/devtools/client/shared/test/browser.ini index 3873df01b14b..7cbcda0dcac3 100644 --- a/devtools/client/shared/test/browser.ini +++ b/devtools/client/shared/test/browser.ini @@ -27,6 +27,7 @@ support-files = doc_toolbar_basic.html doc_toolbar_webconsole_errors_count.html dummy.html + frame-script-utils.js head.js helper_color_data.js helper_html_tooltip.js diff --git a/devtools/client/shared/frame-script-utils.js b/devtools/client/shared/test/frame-script-utils.js similarity index 100% rename from devtools/client/shared/frame-script-utils.js rename to devtools/client/shared/test/frame-script-utils.js diff --git a/devtools/client/shared/test/shared-head.js b/devtools/client/shared/test/shared-head.js index 6b60281a0ff7..3e3d06086501 100644 --- a/devtools/client/shared/test/shared-head.js +++ b/devtools/client/shared/test/shared-head.js @@ -119,7 +119,7 @@ var waitForTime = DevToolsUtils.waitForTime; function loadFrameScriptUtils(browser = gBrowser.selectedBrowser) { let mm = browser.messageManager; - let frameURL = "chrome://devtools/content/shared/frame-script-utils.js"; + let frameURL = "chrome://mochitests/content/browser/devtools/client/shared/test/frame-script-utils.js"; info("Loading the helper frame script " + frameURL); mm.loadFrameScript(frameURL, false); SimpleTest.registerCleanupFunction(() => { diff --git a/devtools/client/webaudioeditor/test/browser.ini b/devtools/client/webaudioeditor/test/browser.ini index 8a6fdc0539e7..dc7b25b8280a 100644 --- a/devtools/client/webaudioeditor/test/browser.ini +++ b/devtools/client/webaudioeditor/test/browser.ini @@ -18,6 +18,7 @@ support-files = doc_bug_1141261.html 440hz_sine.ogg head.js + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js [browser_audionode-actor-get-param-flags.js] diff --git a/devtools/client/webconsole/net/test/mochitest/browser.ini b/devtools/client/webconsole/net/test/mochitest/browser.ini index 98470c6f5c29..6c4a424f9950 100644 --- a/devtools/client/webconsole/net/test/mochitest/browser.ini +++ b/devtools/client/webconsole/net/test/mochitest/browser.ini @@ -11,6 +11,7 @@ support-files = test.txt test.xml test.xml^headers^ + !/devtools/client/shared/test/frame-script-utils.js !/devtools/client/shared/test/shared-head.js !/devtools/client/webconsole/test/head.js diff --git a/devtools/client/webconsole/net/test/mochitest/head.js b/devtools/client/webconsole/net/test/mochitest/head.js index e26ed2efe033..dd69370fa39c 100644 --- a/devtools/client/webconsole/net/test/mochitest/head.js +++ b/devtools/client/webconsole/net/test/mochitest/head.js @@ -40,7 +40,7 @@ function addTestTab(url) { return Task.spawn(function* () { let tab = yield addTab(url); - // Load devtools/shared/frame-script-utils.js + // Load devtools/shared/test/frame-script-utils.js loadFrameScriptUtils(tab.linkedBrowser); // Open the Console panel