diff --git a/devtools/server/startup/content-process-script.js b/devtools/server/startup/content-process-script.js index cc1d2c388b95..361333cfe89c 100644 --- a/devtools/server/startup/content-process-script.js +++ b/devtools/server/startup/content-process-script.js @@ -215,10 +215,10 @@ class ContentProcessStartup { const prefix = parentConnectionPrefix + "contentProcess" + Services.appinfo.processID; //TODO: probably merge content-process.jsm with this module - const { init } = ChromeUtils.import( + const { initContentProcessTarget } = ChromeUtils.import( "resource://devtools/server/startup/content-process.jsm" ); - const { actor, connection } = init({ + const { actor, connection } = initContentProcessTarget({ target: Services.cpmm, data: { watcherActorID, diff --git a/devtools/server/startup/content-process.js b/devtools/server/startup/content-process.js index 07c9ef2456cf..859c7be31066 100644 --- a/devtools/server/startup/content-process.js +++ b/devtools/server/startup/content-process.js @@ -19,10 +19,10 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function onInit(message) { // Only reply if we are in a real content process if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - const { init } = ChromeUtils.import( + const { initContentProcessTarget } = ChromeUtils.import( "resource://devtools/server/startup/content-process.jsm" ); - init(message); + initContentProcessTarget(message); } } diff --git a/devtools/server/startup/content-process.jsm b/devtools/server/startup/content-process.jsm index 9d82cb317cd9..c54e8d2048d4 100644 --- a/devtools/server/startup/content-process.jsm +++ b/devtools/server/startup/content-process.jsm @@ -13,8 +13,8 @@ * The actual server startup itself is in this JSM so that code can be cached. */ -/* exported init */ -const EXPORTED_SYMBOLS = ["init"]; +/* exported initContentProcessTarget */ +const EXPORTED_SYMBOLS = ["initContentProcessTarget"]; let gLoader; @@ -63,7 +63,7 @@ function setupServer(mm) { return gLoader; } -function init(msg) { +function initContentProcessTarget(msg) { const mm = msg.target; const prefix = msg.data.prefix; const watcherActorID = msg.data.watcherActorID;