diff --git a/browser/components/translation/test/browser_translation_infobar.js b/browser/components/translation/test/browser_translation_infobar.js index 386f220c834c..4e177ab325a1 100644 --- a/browser/components/translation/test/browser_translation_infobar.js +++ b/browser/components/translation/test/browser_translation_infobar.js @@ -29,6 +29,7 @@ class TranslationStub extends TranslationParent { constructor(browser) { super(); this._browser = browser; + this.actorCreated(); } get browser() { diff --git a/dom/ipc/JSProcessActorParent.cpp b/dom/ipc/JSProcessActorParent.cpp index 17528b250629..6d52832c6608 100644 --- a/dom/ipc/JSProcessActorParent.cpp +++ b/dom/ipc/JSProcessActorParent.cpp @@ -31,8 +31,6 @@ void JSProcessActorParent::Init(const nsACString& aName, MOZ_ASSERT(!mManager, "Cannot Init() a JSProcessActorParent twice!"); SetName(aName); mManager = aManager; - - InvokeCallback(CallbackFunction::ActorCreated); } JSProcessActorParent::~JSProcessActorParent() { MOZ_ASSERT(!mManager); } diff --git a/dom/ipc/JSWindowActorParent.cpp b/dom/ipc/JSWindowActorParent.cpp index d5dee52ee833..41c4ac4837cc 100644 --- a/dom/ipc/JSWindowActorParent.cpp +++ b/dom/ipc/JSWindowActorParent.cpp @@ -31,8 +31,6 @@ void JSWindowActorParent::Init(const nsACString& aName, MOZ_ASSERT(!mManager, "Cannot Init() a JSWindowActorParent twice!"); SetName(aName); mManager = aManager; - - InvokeCallback(CallbackFunction::ActorCreated); } namespace { diff --git a/dom/ipc/tests/JSProcessActor/browser_getActor.js b/dom/ipc/tests/JSProcessActor/browser_getActor.js index 1f8734a399f9..128579640f92 100644 --- a/dom/ipc/tests/JSProcessActor/browser_getActor.js +++ b/dom/ipc/tests/JSProcessActor/browser_getActor.js @@ -2,35 +2,15 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; -const ACTOR_PARENT_CREATED_NOTIFICATION = "test-process-actor-parent-created"; - -function promiseNotification(aNotification) { - const { Services } = ChromeUtils.import( - "resource://gre/modules/Services.jsm" - ); - let notificationResolve; - let notificationObserver = function observer() { - notificationResolve(); - Services.obs.removeObserver(notificationObserver, aNotification); - }; - return new Promise(resolve => { - notificationResolve = resolve; - Services.obs.addObserver(notificationObserver, aNotification); - }); -} - declTest("getActor on both sides", { async test(browser) { - let parentCreationObserved = promiseNotification( - ACTOR_PARENT_CREATED_NOTIFICATION - ); let parent = browser.browsingContext.currentWindowGlobal.contentParent; ok(parent, "WindowGlobalParent should have value."); let actorParent = parent.getActor("TestProcessActor"); is( actorParent.show(), "TestProcessActorParent", - "actor show should have value." + "actor show should have vaule." ); is( actorParent.manager, @@ -38,34 +18,20 @@ declTest("getActor on both sides", { "manager should match WindowGlobalParent.contentParent" ); - await parentCreationObserved; - ok(true, "Parent creation was observed"); - - await SpecialPowers.spawn( - browser, - [promiseNotification.toString()], - async function(promiseNotificationSource) { - const ACTOR_CHILD_CREATED_NOTIFICATION = - "test-process-actor-child-created"; - let childCreationObserved = new Function(promiseNotificationSource)( - ACTOR_CHILD_CREATED_NOTIFICATION - ); - let child = ChromeUtils.contentChild; - ok(child, "WindowGlobalChild should have value."); - let actorChild = child.getActor("TestProcessActor"); - is( - actorChild.show(), - "TestProcessActorChild", - "actor show should have vaule." - ); - is( - actorChild.manager, - child, - "manager should match ChromeUtils.contentChild." - ); - await childCreationObserved; - ok(true, "Child creation was observed"); - } - ); + await SpecialPowers.spawn(browser, [], async function() { + let child = ChromeUtils.contentChild; + ok(child, "WindowGlobalChild should have value."); + let actorChild = child.getActor("TestProcessActor"); + is( + actorChild.show(), + "TestProcessActorChild", + "actor show should have vaule." + ); + is( + actorChild.manager, + child, + "manager should match ChromeUtils.contentChild." + ); + }); }, }); diff --git a/dom/ipc/tests/JSProcessActor/head.js b/dom/ipc/tests/JSProcessActor/head.js index f37462ec8b77..1bd14c1dfaf7 100644 --- a/dom/ipc/tests/JSProcessActor/head.js +++ b/dom/ipc/tests/JSProcessActor/head.js @@ -17,21 +17,6 @@ let processActorOptions = { }, }; -function promiseNotification(aNotification) { - const { Services } = ChromeUtils.import( - "resource://gre/modules/Services.jsm" - ); - let notificationResolve; - let notificationObserver = function observer() { - notificationResolve(); - Services.obs.removeObserver(notificationObserver, aNotification); - }; - return new Promise(resolve => { - notificationResolve = resolve; - Services.obs.addObserver(notificationObserver, aNotification); - }); -} - function declTest(name, cfg) { let { url = "about:blank", remoteTypes, fission, test } = cfg; diff --git a/dom/ipc/tests/JSWindowActor/browser_getActor.js b/dom/ipc/tests/JSWindowActor/browser_getActor.js index ed26f5a61622..f0cc80e8f80a 100644 --- a/dom/ipc/tests/JSWindowActor/browser_getActor.js +++ b/dom/ipc/tests/JSWindowActor/browser_getActor.js @@ -2,69 +2,25 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; -const ACTOR_PARENT_CREATED_NOTIFICATION = "test-window-actor-parent-created"; - -function promiseNotification(aNotification) { - const { Services } = ChromeUtils.import( - "resource://gre/modules/Services.jsm" - ); - let notificationResolve; - let notificationObserver = function observer() { - notificationResolve(); - Services.obs.removeObserver(notificationObserver, aNotification); - }; - return new Promise(resolve => { - notificationResolve = resolve; - Services.obs.addObserver(notificationObserver, aNotification); - }); -} - declTest("getActor on both sides", { async test(browser) { - let parentCreationObserved = promiseNotification( - ACTOR_PARENT_CREATED_NOTIFICATION - ); let parent = browser.browsingContext.currentWindowGlobal; ok(parent, "WindowGlobalParent should have value."); let actorParent = parent.getActor("TestWindow"); is(actorParent.show(), "TestWindowParent", "actor show should have vaule."); is(actorParent.manager, parent, "manager should match WindowGlobalParent."); - await parentCreationObserved; - ok(true, "Parent creation was observed"); - - await SpecialPowers.spawn( - browser, - [promiseNotification.toString()], - async function(promiseNotificationSource) { - const ACTOR_CHILD_CREATED_NOTIFICATION = - "test-window-actor-child-created"; - let childCreationObserved = new Function(promiseNotificationSource)( - ACTOR_CHILD_CREATED_NOTIFICATION - ); - - let child = content.windowGlobalChild; - ok(child, "WindowGlobalChild should have value."); - is( - child.isInProcess, - false, - "Actor should be loaded in the content process." - ); - let actorChild = child.getActor("TestWindow"); - is( - actorChild.show(), - "TestWindowChild", - "actor show should have vaule." - ); - is( - actorChild.manager, - child, - "manager should match WindowGlobalChild." - ); - - await childCreationObserved; - ok(true, "Child creation was observed"); - } - ); + await SpecialPowers.spawn(browser, [], async function() { + let child = content.windowGlobalChild; + ok(child, "WindowGlobalChild should have value."); + is( + child.isInProcess, + false, + "Actor should be loaded in the content process." + ); + let actorChild = child.getActor("TestWindow"); + is(actorChild.show(), "TestWindowChild", "actor show should have vaule."); + is(actorChild.manager, child, "manager should match WindowGlobalChild."); + }); }, }); diff --git a/toolkit/actors/TestProcessActorChild.jsm b/toolkit/actors/TestProcessActorChild.jsm index 9c3aa98585bd..73955e134eb4 100644 --- a/toolkit/actors/TestProcessActorChild.jsm +++ b/toolkit/actors/TestProcessActorChild.jsm @@ -13,13 +13,6 @@ class TestProcessActorChild extends JSProcessActorChild { super(); } - actorCreated() { - const { Services } = ChromeUtils.import( - "resource://gre/modules/Services.jsm" - ); - Services.obs.notifyObservers(null, "test-process-actor-child-created"); - } - receiveMessage(aMessage) { switch (aMessage.name) { case "toChild": diff --git a/toolkit/actors/TestProcessActorParent.jsm b/toolkit/actors/TestProcessActorParent.jsm index 6b6805b61df1..41e5b2492808 100644 --- a/toolkit/actors/TestProcessActorParent.jsm +++ b/toolkit/actors/TestProcessActorParent.jsm @@ -11,12 +11,7 @@ class TestProcessActorParent extends JSProcessActorParent { super(); this.wrappedJSObject = this; } - actorCreated() { - const { Services } = ChromeUtils.import( - "resource://gre/modules/Services.jsm" - ); - Services.obs.notifyObservers(null, "test-process-actor-parent-created"); - } + receiveMessage(aMessage) { switch (aMessage.name) { case "init": diff --git a/toolkit/actors/TestWindowChild.jsm b/toolkit/actors/TestWindowChild.jsm index 071d989bf60e..104282e5bd78 100644 --- a/toolkit/actors/TestWindowChild.jsm +++ b/toolkit/actors/TestWindowChild.jsm @@ -13,13 +13,6 @@ class TestWindowChild extends JSWindowActorChild { super(); } - actorCreated() { - const { Services } = ChromeUtils.import( - "resource://gre/modules/Services.jsm" - ); - Services.obs.notifyObservers(null, "test-window-actor-child-created"); - } - receiveMessage(aMessage) { switch (aMessage.name) { case "toChild": diff --git a/toolkit/actors/TestWindowParent.jsm b/toolkit/actors/TestWindowParent.jsm index d5d5604df81b..6e3078bf7514 100644 --- a/toolkit/actors/TestWindowParent.jsm +++ b/toolkit/actors/TestWindowParent.jsm @@ -14,13 +14,6 @@ class TestWindowParent extends JSWindowActorParent { this.wrappedJSObject = this; } - actorCreated() { - const { Services } = ChromeUtils.import( - "resource://gre/modules/Services.jsm" - ); - Services.obs.notifyObservers(null, "test-window-actor-child-created"); - } - receiveMessage(aMessage) { switch (aMessage.name) { case "init":