Bug 1690475 - [remote] Reorganize xpcshell and browser chrome tests. …

…r=remote-protocol-reviewers,jdescottes Differential Revision: https://phabricator.services.mozilla.com/D106062
dothq · Feb 23, 2021 · 563458a · 563458a
1 parent 23f1f53
commit 563458a
Show file tree

Hide file tree

Showing 128 changed files with 124 additions and 108 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -158,7 +158,7 @@ python/
 
 # These are (mainly) imported code that we don't want to lint to make imports easier.
 remote/cdp/Protocol.jsm
-remote/test/browser/chrome-remote-interface.js
+remote/cdp/test/browser/chrome-remote-interface.js
 
 # services/ exclusions
 

diff --git a/remote/cdp/moz.build b/remote/cdp/moz.build
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+BROWSER_CHROME_MANIFESTS += [
+    "test/browser/browser.ini",
+    "test/browser/dom/browser.ini",
+    "test/browser/emulation/browser.ini",
+    "test/browser/input/browser.ini",
+    "test/browser/io/browser.ini",
+    "test/browser/log/browser.ini",
+    "test/browser/network/browser.ini",
+    "test/browser/page/browser.ini",
+    "test/browser/runtime/browser.ini",
+    "test/browser/security/browser.ini",
+    "test/browser/target/browser.ini",
+]
+
+XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"]
diff --git a/remote/test/browser/README.md → remote/cdp/test/browser/README.md b/remote/test/browser/README.md → remote/cdp/test/browser/README.md
diff --git a/remote/test/browser/browser.ini → remote/cdp/test/browser/browser.ini b/remote/test/browser/browser.ini → remote/cdp/test/browser/browser.ini
diff --git a/remote/test/browser/browser_agent.js → remote/cdp/test/browser/browser_agent.js b/remote/test/browser/browser_agent.js → remote/cdp/test/browser/browser_agent.js
diff --git a/remote/test/browser/browser_cdp.js → remote/cdp/test/browser/browser_cdp.js b/remote/test/browser/browser_cdp.js → remote/cdp/test/browser/browser_cdp.js
diff --git a/remote/test/browser/browser_httpd.js → remote/cdp/test/browser/browser_httpd.js b/remote/test/browser/browser_httpd.js → remote/cdp/test/browser/browser_httpd.js
diff --git a/remote/test/browser/browser_main_target.js → ...e/cdp/test/browser/browser_main_target.js b/remote/test/browser/browser_main_target.js → ...e/cdp/test/browser/browser_main_target.js
diff --git a/remote/test/browser/browser_session.js → remote/cdp/test/browser/browser_session.js b/remote/test/browser/browser_session.js → remote/cdp/test/browser/browser_session.js
diff --git a/remote/test/browser/browser_tabs.js → remote/cdp/test/browser/browser_tabs.js b/remote/test/browser/browser_tabs.js → remote/cdp/test/browser/browser_tabs.js
diff --git a/...e/test/browser/chrome-remote-interface.js → ...p/test/browser/chrome-remote-interface.js b/...e/test/browser/chrome-remote-interface.js → ...p/test/browser/chrome-remote-interface.js
diff --git a/remote/test/browser/dom/browser.ini → remote/cdp/test/browser/dom/browser.ini b/remote/test/browser/dom/browser.ini → remote/cdp/test/browser/dom/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
 
 [browser_describeNode.js]

diff --git a/.../test/browser/dom/browser_describeNode.js → .../test/browser/dom/browser_describeNode.js b/.../test/browser/dom/browser_describeNode.js → .../test/browser/dom/browser_describeNode.js
diff --git a/...e/test/browser/dom/browser_resolveNode.js → ...p/test/browser/dom/browser_resolveNode.js b/...e/test/browser/dom/browser_resolveNode.js → ...p/test/browser/dom/browser_resolveNode.js
diff --git a/remote/test/browser/log/head.js → remote/cdp/test/browser/dom/head.js b/remote/test/browser/log/head.js → remote/cdp/test/browser/dom/head.js
@@ -6,6 +6,6 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
diff --git a/remote/test/browser/emulation/browser.ini → ...te/cdp/test/browser/emulation/browser.ini b/remote/test/browser/emulation/browser.ini → ...te/cdp/test/browser/emulation/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
 
 [browser_setDeviceMetricsOverride.js]

diff --git a/...ation/browser_setDeviceMetricsOverride.js → ...ation/browser_setDeviceMetricsOverride.js b/...ation/browser_setDeviceMetricsOverride.js → ...ation/browser_setDeviceMetricsOverride.js
diff --git a/...ation/browser_setTouchEmulationEnabled.js → ...ation/browser_setTouchEmulationEnabled.js b/...ation/browser_setTouchEmulationEnabled.js → ...ation/browser_setTouchEmulationEnabled.js
diff --git a/...emulation/browser_setUserAgentOverride.js → ...emulation/browser_setUserAgentOverride.js b/...emulation/browser_setUserAgentOverride.js → ...emulation/browser_setUserAgentOverride.js
diff --git a/remote/test/browser/dom/head.js → remote/cdp/test/browser/emulation/head.js b/remote/test/browser/dom/head.js → remote/cdp/test/browser/emulation/head.js
@@ -6,6 +6,6 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
diff --git a/remote/test/browser/head.js → remote/cdp/test/browser/head.js b/remote/test/browser/head.js → remote/cdp/test/browser/head.js
@@ -134,7 +134,7 @@ async function getCDP() {
 
   const window = document.defaultView.wrappedJSObject;
   Services.scriptloader.loadSubScript(
-    "chrome://mochitests/content/browser/remote/test/browser/chrome-remote-interface.js",
+    "chrome://mochitests/content/browser/remote/cdp/test/browser/chrome-remote-interface.js",
     window
   );
 

diff --git a/remote/test/browser/input/browser.ini → remote/cdp/test/browser/input/browser.ini b/remote/test/browser/input/browser.ini → remote/cdp/test/browser/input/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
   doc_events.html
   doc_dispatchKeyEvent_race.html

diff --git a/...browser/input/browser_dispatchKeyEvent.js → ...browser/input/browser_dispatchKeyEvent.js b/...browser/input/browser_dispatchKeyEvent.js → ...browser/input/browser_dispatchKeyEvent.js
diff --git a/.../input/browser_dispatchKeyEvent_events.js → .../input/browser_dispatchKeyEvent_events.js b/.../input/browser_dispatchKeyEvent_events.js → .../input/browser_dispatchKeyEvent_events.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const PAGE_URL =
-  "http://example.com/browser/remote/test/browser/input/doc_events.html";
+  "http://example.com/browser/remote/cdp/test/browser/input/doc_events.html";
 
 add_task(async function testShiftEvents({ client }) {
   await setupForInput(PAGE_URL);

diff --git a/...er/input/browser_dispatchKeyEvent_race.js → ...er/input/browser_dispatchKeyEvent_race.js b/...er/input/browser_dispatchKeyEvent_race.js → ...er/input/browser_dispatchKeyEvent_race.js
@@ -27,7 +27,7 @@
 // in different processes.
 
 const PAGE_URL =
-  "http://example.com/browser/remote/test/browser/input/doc_dispatchKeyEvent_race.html";
+  "http://example.com/browser/remote/cdp/test/browser/input/doc_dispatchKeyEvent_race.html";
 
 add_task(async function({ client }) {
   await loadURL(PAGE_URL);

diff --git a/...owser/input/browser_dispatchMouseEvent.js → ...owser/input/browser_dispatchMouseEvent.js b/...owser/input/browser_dispatchMouseEvent.js → ...owser/input/browser_dispatchMouseEvent.js
diff --git a/...wser/input/doc_dispatchKeyEvent_race.html → ...wser/input/doc_dispatchKeyEvent_race.html b/...wser/input/doc_dispatchKeyEvent_race.html → ...wser/input/doc_dispatchKeyEvent_race.html
diff --git a/remote/test/browser/input/doc_events.html → ...te/cdp/test/browser/input/doc_events.html b/remote/test/browser/input/doc_events.html → ...te/cdp/test/browser/input/doc_events.html
diff --git a/remote/test/browser/input/head.js → remote/cdp/test/browser/input/head.js b/remote/test/browser/input/head.js → remote/cdp/test/browser/input/head.js
@@ -6,7 +6,7 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
 

diff --git a/remote/test/browser/io/browser.ini → remote/cdp/test/browser/io/browser.ini b/remote/test/browser/io/browser.ini → remote/cdp/test/browser/io/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
 
 [browser_close.js]

diff --git a/remote/test/browser/io/browser_close.js → remote/cdp/test/browser/io/browser_close.js b/remote/test/browser/io/browser_close.js → remote/cdp/test/browser/io/browser_close.js
diff --git a/remote/test/browser/io/browser_read.js → remote/cdp/test/browser/io/browser_read.js b/remote/test/browser/io/browser_read.js → remote/cdp/test/browser/io/browser_read.js
diff --git a/remote/test/browser/io/head.js → remote/cdp/test/browser/io/head.js b/remote/test/browser/io/head.js → remote/cdp/test/browser/io/head.js
@@ -6,7 +6,7 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
 

diff --git a/remote/test/browser/log/browser.ini → remote/cdp/test/browser/log/browser.ini b/remote/test/browser/log/browser.ini → remote/cdp/test/browser/log/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
 
 [browser_entryAdded.js]
diff --git a/...te/test/browser/log/browser_entryAdded.js → ...dp/test/browser/log/browser_entryAdded.js b/...te/test/browser/log/browser_entryAdded.js → ...dp/test/browser/log/browser_entryAdded.js
diff --git a/remote/test/browser/runtime/head.js → remote/cdp/test/browser/log/head.js b/remote/test/browser/runtime/head.js → remote/cdp/test/browser/log/head.js
@@ -6,6 +6,6 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
diff --git a/remote/test/browser/network/browser.ini → remote/cdp/test/browser/network/browser.ini b/remote/test/browser/network/browser.ini → remote/cdp/test/browser/network/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
   doc_empty.html
   doc_frameset.html

diff --git a/.../browser/network/browser_deleteCookies.js → .../browser/network/browser_deleteCookies.js b/.../browser/network/browser_deleteCookies.js → .../browser/network/browser_deleteCookies.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs";
+const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs";
 
 const DEFAULT_HOST = "http://example.org";
 const DEFAULT_HOSTNAME = "example.org";
@@ -230,9 +230,9 @@ add_task(async function forSpecificDomainAndURL({ client }) {
 add_task(async function path({ client }) {
   const { Network } = client;
 
-  const PATH = "/browser/remote/test/browser/";
-  const PARENT_PATH = "/browser/remote/test/";
-  const SUB_PATH = "/browser/remote/test/browser/network/";
+  const PATH = "/browser/remote/cdp/test/browser/";
+  const PARENT_PATH = "/browser/remote/cdp/test/";
+  const SUB_PATH = "/browser/remote/cdp/test/browser/network/";
 
   const cookie = {
     name: "foo",

diff --git a/...twork/browser_emulateNetworkConditions.js → ...twork/browser_emulateNetworkConditions.js b/...twork/browser_emulateNetworkConditions.js → ...twork/browser_emulateNetworkConditions.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const pageEmptyURL =
-  "http://example.com/browser/remote/test/browser/page/doc_empty.html";
+  "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html";
 
 /**
  * Acts just as `add_task`, but does cleanup afterwards

diff --git a/.../browser/network/browser_getAllCookies.js → .../browser/network/browser_getAllCookies.js b/.../browser/network/browser_getAllCookies.js → .../browser/network/browser_getAllCookies.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs";
+const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs";
 
 const DEFAULT_HOST = "http://example.org";
 const ALT_HOST = "http://example.net";
@@ -143,8 +143,8 @@ add_task(async function session({ client }) {
 
 add_task(async function path({ client }) {
   const { Network } = client;
-  const PATH = "/browser/remote/test/browser/";
-  const PARENT_PATH = "/browser/remote/test/";
+  const PATH = "/browser/remote/cdp/test/browser/";
+  const PARENT_PATH = "/browser/remote/cdp/test/";
 
   await loadURL(`${DEFAULT_URL}?name=foo&value=bar&path=${PATH}`);
 

diff --git a/...est/browser/network/browser_getCookies.js → ...est/browser/network/browser_getCookies.js b/...est/browser/network/browser_getCookies.js → ...est/browser/network/browser_getCookies.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs";
+const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs";
 
 const DEFAULT_HOST = "http://example.org";
 const ALT_HOST = "http://example.net";
@@ -140,8 +140,8 @@ add_task(async function session({ client }) {
 
 add_task(async function path({ client }) {
   const { Network } = client;
-  const PATH = "/browser/remote/test/browser/";
-  const PARENT_PATH = "/browser/remote/test/";
+  const PATH = "/browser/remote/cdp/test/browser/";
+  const PARENT_PATH = "/browser/remote/cdp/test/";
 
   await loadURL(`${DEFAULT_URL}?name=foo&value=bar&path=${PATH}`);
 

diff --git a/...owser/network/browser_navigationEvents.js → ...owser/network/browser_navigationEvents.js b/...owser/network/browser_navigationEvents.js → ...owser/network/browser_navigationEvents.js
@@ -6,7 +6,7 @@
 // Test order and consistency of Network/Page events as a whole.
 // Details of specific events are checked in event-specific test files.
 
-const BASE_PATH = "http://example.com/browser/remote/test/browser/network";
+const BASE_PATH = "http://example.com/browser/remote/cdp/test/browser/network";
 const FRAMESET_URL = `${BASE_PATH}/doc_frameset.html`;
 const FRAMESET_JS_URL = `${BASE_PATH}/file_framesetEvents.js`;
 const PAGE_URL = `${BASE_PATH}/doc_networkEvents.html`;

diff --git a/...wser/network/browser_requestWillBeSent.js → ...wser/network/browser_requestWillBeSent.js b/...wser/network/browser_requestWillBeSent.js → ...wser/network/browser_requestWillBeSent.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const BASE_PATH = "http://example.com/browser/remote/test/browser/network";
+const BASE_PATH = "http://example.com/browser/remote/cdp/test/browser/network";
 const FRAMESET_URL = `${BASE_PATH}/doc_frameset.html`;
 const FRAMESET_JS_URL = `${BASE_PATH}/file_framesetEvents.js`;
 const PAGE_URL = `${BASE_PATH}/doc_networkEvents.html`;

diff --git a/...owser/network/browser_responseReceived.js → ...owser/network/browser_responseReceived.js b/...owser/network/browser_responseReceived.js → ...owser/network/browser_responseReceived.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const BASE_PATH = "http://example.com/browser/remote/test/browser/network";
+const BASE_PATH = "http://example.com/browser/remote/cdp/test/browser/network";
 const FRAMESET_URL = `${BASE_PATH}/doc_frameset.html`;
 const FRAMESET_JS_URL = `${BASE_PATH}/file_framesetEvents.js`;
 const PAGE_URL = `${BASE_PATH}/doc_networkEvents.html`;

diff --git a/...owser/network/browser_setCacheDisabled.js → ...owser/network/browser_setCacheDisabled.js b/...owser/network/browser_setCacheDisabled.js → ...owser/network/browser_setCacheDisabled.js
@@ -6,7 +6,7 @@
 const { INHIBIT_CACHING, LOAD_BYPASS_CACHE, LOAD_NORMAL } = Ci.nsIRequest;
 
 const TEST_PAGE =
-  "http://example.com/browser/remote/test/browser/network/doc_empty.html";
+  "http://example.com/browser/remote/cdp/test/browser/network/doc_empty.html";
 
 add_task(async function cacheEnabledAfterDisabled({ client }) {
   const { Network } = client;

diff --git a/...test/browser/network/browser_setCookie.js → ...test/browser/network/browser_setCookie.js b/...test/browser/network/browser_setCookie.js → ...test/browser/network/browser_setCookie.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs";
+const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs";
 
 const DEFAULT_HOST = "example.org";
 const ALT_HOST = "foo.example.org";

diff --git a/...est/browser/network/browser_setCookies.js → ...est/browser/network/browser_setCookies.js b/...est/browser/network/browser_setCookies.js → ...est/browser/network/browser_setCookies.js
diff --git a/...r/network/browser_setUserAgentOverride.js → ...r/network/browser_setUserAgentOverride.js b/...r/network/browser_setUserAgentOverride.js → ...r/network/browser_setUserAgentOverride.js
diff --git a/remote/test/browser/network/doc_empty.html → ...e/cdp/test/browser/network/doc_empty.html b/remote/test/browser/network/doc_empty.html → ...e/cdp/test/browser/network/doc_empty.html
diff --git a/...te/test/browser/network/doc_frameset.html → ...dp/test/browser/network/doc_frameset.html b/...te/test/browser/network/doc_frameset.html → ...dp/test/browser/network/doc_frameset.html
diff --git a/...st/browser/network/doc_networkEvents.html → ...st/browser/network/doc_networkEvents.html b/...st/browser/network/doc_networkEvents.html → ...st/browser/network/doc_networkEvents.html
diff --git a/...st/browser/network/file_framesetEvents.js → ...st/browser/network/file_framesetEvents.js b/...st/browser/network/file_framesetEvents.js → ...st/browser/network/file_framesetEvents.js
diff --git a/...est/browser/network/file_networkEvents.js → ...est/browser/network/file_networkEvents.js b/...est/browser/network/file_networkEvents.js → ...est/browser/network/file_networkEvents.js
diff --git a/remote/test/browser/network/head.js → remote/cdp/test/browser/network/head.js b/remote/test/browser/network/head.js → remote/cdp/test/browser/network/head.js
@@ -6,7 +6,7 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
 

diff --git a/remote/test/browser/network/sjs-cookies.sjs → .../cdp/test/browser/network/sjs-cookies.sjs b/remote/test/browser/network/sjs-cookies.sjs → .../cdp/test/browser/network/sjs-cookies.sjs
diff --git a/remote/test/browser/page/browser.ini → remote/cdp/test/browser/page/browser.ini b/remote/test/browser/page/browser.ini → remote/cdp/test/browser/page/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
   doc_empty.html
   sjs_redirect.sjs

diff --git a/...test/browser/page/browser_bringToFront.js → ...test/browser/page/browser_bringToFront.js b/...test/browser/page/browser_bringToFront.js → ...test/browser/page/browser_bringToFront.js
diff --git a/...browser/page/browser_captureScreenshot.js → ...browser/page/browser_captureScreenshot.js b/...browser/page/browser_captureScreenshot.js → ...browser/page/browser_captureScreenshot.js
diff --git a/...owser/page/browser_createIsolatedWorld.js → ...owser/page/browser_createIsolatedWorld.js b/...owser/page/browser_createIsolatedWorld.js → ...owser/page/browser_createIsolatedWorld.js
diff --git a/...wser/page/browser_domContentEventFired.js → ...wser/page/browser_domContentEventFired.js b/...wser/page/browser_domContentEventFired.js → ...wser/page/browser_domContentEventFired.js
diff --git a/...est/browser/page/browser_frameAttached.js → ...est/browser/page/browser_frameAttached.js b/...est/browser/page/browser_frameAttached.js → ...est/browser/page/browser_frameAttached.js
diff --git a/...est/browser/page/browser_frameDetached.js → ...est/browser/page/browser_frameDetached.js b/...est/browser/page/browser_frameDetached.js → ...est/browser/page/browser_frameDetached.js
diff --git a/...st/browser/page/browser_frameNavigated.js → ...st/browser/page/browser_frameNavigated.js b/...st/browser/page/browser_frameNavigated.js → ...st/browser/page/browser_frameNavigated.js
diff --git a/...owser/page/browser_frameStartedLoading.js → ...owser/page/browser_frameStartedLoading.js b/...owser/page/browser_frameStartedLoading.js → ...owser/page/browser_frameStartedLoading.js
diff --git a/...owser/page/browser_frameStoppedLoading.js → ...owser/page/browser_frameStoppedLoading.js b/...owser/page/browser_frameStoppedLoading.js → ...owser/page/browser_frameStoppedLoading.js
diff --git a/...test/browser/page/browser_getFrameTree.js → ...test/browser/page/browser_getFrameTree.js b/...test/browser/page/browser_getFrameTree.js → ...test/browser/page/browser_getFrameTree.js
diff --git a/.../browser/page/browser_getLayoutMetrics.js → .../browser/page/browser_getLayoutMetrics.js b/.../browser/page/browser_getLayoutMetrics.js → .../browser/page/browser_getLayoutMetrics.js
diff --git a/...wser/page/browser_getNavigationHistory.js → ...wser/page/browser_getNavigationHistory.js b/...wser/page/browser_getNavigationHistory.js → ...wser/page/browser_getNavigationHistory.js
@@ -49,9 +49,9 @@ add_task(async function locationRedirect({ client }) {
   const { Page } = client;
 
   const pageEmptyURL =
-    "http://example.com/browser/remote/test/browser/page/doc_empty.html";
+    "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html";
   const sjsURL =
-    "http://example.com/browser/remote/test/browser/page/sjs_redirect.sjs";
+    "http://example.com/browser/remote/cdp/test/browser/page/sjs_redirect.sjs";
   const redirectURL = `${sjsURL}?${pageEmptyURL}`;
 
   const data = [

diff --git a/...er/page/browser_javascriptDialog_alert.js → ...er/page/browser_javascriptDialog_alert.js b/...er/page/browser_javascriptDialog_alert.js → ...er/page/browser_javascriptDialog_alert.js
diff --git a/.../browser_javascriptDialog_beforeunload.js → .../browser_javascriptDialog_beforeunload.js b/.../browser_javascriptDialog_beforeunload.js → .../browser_javascriptDialog_beforeunload.js
diff --git a/.../page/browser_javascriptDialog_confirm.js → .../page/browser_javascriptDialog_confirm.js b/.../page/browser_javascriptDialog_confirm.js → .../page/browser_javascriptDialog_confirm.js
diff --git a/...e/browser_javascriptDialog_otherTarget.js → ...e/browser_javascriptDialog_otherTarget.js b/...e/browser_javascriptDialog_otherTarget.js → ...e/browser_javascriptDialog_otherTarget.js
diff --git a/...r/page/browser_javascriptDialog_prompt.js → ...r/page/browser_javascriptDialog_prompt.js b/...r/page/browser_javascriptDialog_prompt.js → ...r/page/browser_javascriptDialog_prompt.js
diff --git a/...st/browser/page/browser_lifecycleEvent.js → ...st/browser/page/browser_lifecycleEvent.js b/...st/browser/page/browser_lifecycleEvent.js → ...st/browser/page/browser_lifecycleEvent.js
@@ -13,7 +13,7 @@ const DOC_IFRAME_NESTED = toDataURL(`
 `);
 
 const PAGE_URL =
-  "http://example.com/browser/remote/test/browser/page/doc_empty.html";
+  "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html";
 
 add_task(async function noEventsWhenPageDomainDisabled({ client }) {
   await runPageLifecycleTest(client, 0, async () => {

diff --git a/...st/browser/page/browser_loadEventFired.js → ...st/browser/page/browser_loadEventFired.js b/...st/browser/page/browser_loadEventFired.js → ...st/browser/page/browser_loadEventFired.js
diff --git a/remote/test/browser/page/browser_navigate.js → ...cdp/test/browser/page/browser_navigate.js b/remote/test/browser/page/browser_navigate.js → ...cdp/test/browser/page/browser_navigate.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const pageEmptyURL =
-  "http://example.com/browser/remote/test/browser/page/doc_empty.html";
+  "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html";
 
 add_task(async function testBasicNavigation({ client }) {
   const { Page, Network } = client;
@@ -91,7 +91,7 @@ add_task(async function testTwoNavigations({ client }) {
 add_task(async function testRedirect({ client }) {
   const { Page, Network } = client;
   const sjsURL =
-    "http://example.com/browser/remote/test/browser/page/sjs_redirect.sjs";
+    "http://example.com/browser/remote/cdp/test/browser/page/sjs_redirect.sjs";
   const redirectURL = `${sjsURL}?${pageEmptyURL}`;
   await Page.enable();
   await Network.enable();

diff --git a/...er/page/browser_navigateToHistoryEntry.js → ...er/page/browser_navigateToHistoryEntry.js b/...er/page/browser_navigateToHistoryEntry.js → ...er/page/browser_navigateToHistoryEntry.js
diff --git a/.../browser/page/browser_navigationEvents.js → .../browser/page/browser_navigationEvents.js b/.../browser/page/browser_navigationEvents.js → .../browser/page/browser_navigationEvents.js
diff --git a/...e/test/browser/page/browser_printToPDF.js → ...p/test/browser/page/browser_printToPDF.js b/...e/test/browser/page/browser_printToPDF.js → ...p/test/browser/page/browser_printToPDF.js
diff --git a/remote/test/browser/page/browser_reload.js → ...e/cdp/test/browser/page/browser_reload.js b/remote/test/browser/page/browser_reload.js → ...e/cdp/test/browser/page/browser_reload.js
diff --git a/...est/browser/page/browser_runtimeEvents.js → ...est/browser/page/browser_runtimeEvents.js b/...est/browser/page/browser_runtimeEvents.js → ...est/browser/page/browser_runtimeEvents.js
diff --git a/.../browser_scriptToEvaluateOnNewDocument.js → .../browser_scriptToEvaluateOnNewDocument.js b/.../browser_scriptToEvaluateOnNewDocument.js → .../browser_scriptToEvaluateOnNewDocument.js
diff --git a/remote/test/browser/page/doc_empty.html → remote/cdp/test/browser/page/doc_empty.html b/remote/test/browser/page/doc_empty.html → remote/cdp/test/browser/page/doc_empty.html
diff --git a/remote/test/browser/page/head.js → remote/cdp/test/browser/page/head.js b/remote/test/browser/page/head.js → remote/cdp/test/browser/page/head.js
@@ -6,7 +6,7 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
 

diff --git a/remote/test/browser/page/sjs_redirect.sjs → ...te/cdp/test/browser/page/sjs_redirect.sjs b/remote/test/browser/page/sjs_redirect.sjs → ...te/cdp/test/browser/page/sjs_redirect.sjs
diff --git a/remote/test/browser/runtime/browser.ini → remote/cdp/test/browser/runtime/browser.ini b/remote/test/browser/runtime/browser.ini → remote/cdp/test/browser/runtime/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   doc_console_events.html
   head.js
 

diff --git a/...browser/runtime/browser_callFunctionOn.js → ...browser/runtime/browser_callFunctionOn.js b/...browser/runtime/browser_callFunctionOn.js → ...browser/runtime/browser_callFunctionOn.js
diff --git a/...e/browser_callFunctionOn_returnByValue.js → ...e/browser_callFunctionOn_returnByValue.js b/...e/browser_callFunctionOn_returnByValue.js → ...e/browser_callFunctionOn_returnByValue.js
diff --git a/...owser/runtime/browser_consoleAPICalled.js → ...owser/runtime/browser_consoleAPICalled.js b/...owser/runtime/browser_consoleAPICalled.js → ...owser/runtime/browser_consoleAPICalled.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const PAGE_CONSOLE_EVENTS =
-  "http://example.com/browser/remote/test/browser/runtime/doc_console_events.html";
+  "http://example.com/browser/remote/cdp/test/browser/runtime/doc_console_events.html";
 
 add_task(async function noEventsWhenRuntimeDomainDisabled({ client }) {
   await runConsoleTest(client, 0, async () => {

diff --git a/.../test/browser/runtime/browser_evaluate.js → .../test/browser/runtime/browser_evaluate.js b/.../test/browser/runtime/browser_evaluate.js → .../test/browser/runtime/browser_evaluate.js
diff --git a/...rowser/runtime/browser_exceptionThrown.js → ...rowser/runtime/browser_exceptionThrown.js b/...rowser/runtime/browser_exceptionThrown.js → ...rowser/runtime/browser_exceptionThrown.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const PAGE_CONSOLE_EVENTS =
-  "http://example.com/browser/remote/test/browser/runtime/doc_console_events.html";
+  "http://example.com/browser/remote/cdp/test/browser/runtime/doc_console_events.html";
 
 add_task(async function noEventsWhenRuntimeDomainDisabled({ client }) {
   await runExceptionThrownTest(client, 0, async () => {

diff --git a/...runtime/browser_executionContextEvents.js → ...runtime/browser_executionContextEvents.js b/...runtime/browser_executionContextEvents.js → ...runtime/browser_executionContextEvents.js
diff --git a/.../browser/runtime/browser_getProperties.js → .../browser/runtime/browser_getProperties.js b/.../browser/runtime/browser_getProperties.js → .../browser/runtime/browser_getProperties.js
diff --git a/.../browser/runtime/browser_remoteObjects.js → .../browser/runtime/browser_remoteObjects.js b/.../browser/runtime/browser_remoteObjects.js → .../browser/runtime/browser_remoteObjects.js
diff --git a/...t/browser/runtime/doc_console_events.html → ...t/browser/runtime/doc_console_events.html b/...t/browser/runtime/doc_console_events.html → ...t/browser/runtime/doc_console_events.html
diff --git a/remote/test/browser/emulation/head.js → remote/cdp/test/browser/runtime/head.js b/remote/test/browser/emulation/head.js → remote/cdp/test/browser/runtime/head.js
@@ -6,6 +6,6 @@
 /* import-globals-from ../head.js */
 
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js",
   this
 );
diff --git a/remote/test/browser/security/browser.ini → remote/cdp/test/browser/security/browser.ini b/remote/test/browser/security/browser.ini → remote/cdp/test/browser/security/browser.ini
@@ -4,8 +4,8 @@ subsuite = remote
 prefs =
   remote.enabled=true
 support-files =
-  !/remote/test/browser/chrome-remote-interface.js
-  !/remote/test/browser/head.js
+  !/remote/cdp/test/browser/chrome-remote-interface.js
+  !/remote/cdp/test/browser/head.js
   head.js
 
 [browser_setIgnoreCertificateErrors.js]
diff --git a/...ity/browser_setIgnoreCertificateErrors.js → ...ity/browser_setIgnoreCertificateErrors.js b/...ity/browser_setIgnoreCertificateErrors.js → ...ity/browser_setIgnoreCertificateErrors.js