diff --git a/b2g/confvars.sh b/b2g/confvars.sh index 16ecbc1fac1..97c0439e845 100644 --- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -57,7 +57,7 @@ MOZ_PLACES= MOZ_B2G=1 if test "$OS_TARGET" = "Android"; then -MOZ_NUWA_PROCESS= +MOZ_NUWA_PROCESS=1 fi MOZ_FOLD_LIBS=1 diff --git a/dom/ipc/PreallocatedProcessManager.cpp b/dom/ipc/PreallocatedProcessManager.cpp index 3aa9db9f098..d9f500b6d08 100644 --- a/dom/ipc/PreallocatedProcessManager.cpp +++ b/dom/ipc/PreallocatedProcessManager.cpp @@ -309,7 +309,7 @@ PreallocatedProcessManagerImpl::PublishSpareProcess(ContentParent* aContent) do_GetService("@mozilla.org/parentprocessmessagemanager;1"); nsresult rv = ppmm->BroadcastAsyncMessage( NS_LITERAL_STRING("TEST-ONLY:nuwa-add-new-process"), - JSVAL_NULL, JSVAL_NULL, cx, 1); + JS::NullHandleValue, JS::NullHandleValue, cx, 1); } if (!mNuwaForkWaitTasks.IsEmpty()) { @@ -362,7 +362,7 @@ PreallocatedProcessManagerImpl::OnNuwaReady() do_GetService("@mozilla.org/parentprocessmessagemanager;1"); nsresult rv = ppmm->BroadcastAsyncMessage( NS_LITERAL_STRING("TEST-ONLY:nuwa-ready"), - JSVAL_NULL, JSVAL_NULL, cx, 1); + JS::NullHandleValue, JS::NullHandleValue, cx, 1); } NuwaFork(); } diff --git a/dom/ipc/tests/mochitest.ini b/dom/ipc/tests/mochitest.ini index 1bdf4180a89..2f594dd8c01 100644 --- a/dom/ipc/tests/mochitest.ini +++ b/dom/ipc/tests/mochitest.ini @@ -1,2 +1,2 @@ [test_NuwaProcessCreation.html] -skip-if = true # re-enable when nuwa is enabled. +run-if = toolkit == 'gonk'