diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /devtools/client/aboutdebugging/test/browser/helper-mocks.js | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'devtools/client/aboutdebugging/test/browser/helper-mocks.js')
-rw-r--r-- | devtools/client/aboutdebugging/test/browser/helper-mocks.js | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/devtools/client/aboutdebugging/test/browser/helper-mocks.js b/devtools/client/aboutdebugging/test/browser/helper-mocks.js index b1c9c910ff..a8536cf767 100644 --- a/devtools/client/aboutdebugging/test/browser/helper-mocks.js +++ b/devtools/client/aboutdebugging/test/browser/helper-mocks.js @@ -242,9 +242,28 @@ const silenceWorkerUpdates = function () { async function createLocalClientWrapper() { info("Create a local DevToolsClient"); + + // First, instantiate a DevToolsServer, the same way it is being done when running + // firefox --start-debugger-server const { - DevToolsServer, - } = require("resource://devtools/server/devtools-server.js"); + useDistinctSystemPrincipalLoader, + releaseDistinctSystemPrincipalLoader, + } = ChromeUtils.importESModule( + "resource://devtools/shared/loader/DistinctSystemPrincipalLoader.sys.mjs" + ); + const requester = {}; + const serverLoader = useDistinctSystemPrincipalLoader(requester); + registerCleanupFunction(() => { + releaseDistinctSystemPrincipalLoader(requester); + }); + const { DevToolsServer } = serverLoader.require( + "resource://devtools/server/devtools-server.js" + ); + DevToolsServer.init(); + DevToolsServer.registerAllActors(); + DevToolsServer.allowChromeProcess = true; + + // Then spawn a DevToolsClient connected to this new DevToolsServer const { DevToolsClient, } = require("resource://devtools/client/devtools-client.js"); @@ -252,8 +271,6 @@ async function createLocalClientWrapper() { ClientWrapper, } = require("resource://devtools/client/aboutdebugging/src/modules/client-wrapper.js"); - DevToolsServer.init(); - DevToolsServer.registerAllActors(); const client = new DevToolsClient(DevToolsServer.connectPipe()); await client.connect(); |