Bug 1306327 - Avoid call to NS_DebugBreak from content_process_main(). r=billm draft
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 10 Jan 2017 17:50:04 +0900
changeset 462687 10ff45959ace3ec64991b435927e7ba936c87d99
parent 462686 460c6ca73883c3419dafba637a1aaec4fd3a162e
child 462688 3c48557b0ea9e8344a29bc5ce3c652bb24d42eb5
push id41842
push userbmo:mh+mozilla@glandium.org
push dateTue, 17 Jan 2017 22:08:05 +0000
reviewersbillm
bugs1306327
milestone53.0a1
Bug 1306327 - Avoid call to NS_DebugBreak from content_process_main(). r=billm We want to avoid calls to XPCOM glue functions, in order to remove them later on.
ipc/contentproc/plugin-container.cpp
--- a/ipc/contentproc/plugin-container.cpp
+++ b/ipc/contentproc/plugin-container.cpp
@@ -107,12 +107,10 @@ content_process_main(int argc, char* arg
 #if !defined(XP_LINUX) && defined(MOZ_PLUGIN_CONTAINER)
     // On Windows and MacOS, the GMPLoader lives in plugin-container, so that its
     // code can be covered by an EME/GMP vendor's voucher.
     if (XRE_GetProcessType() == GeckoProcessType_GMPlugin) {
         childData.gmpLoader = mozilla::gmp::CreateGMPLoader(MakeSandboxStarter());
     }
 #endif
     nsresult rv = XRE_InitChildProcess(argc, argv, &childData);
-    NS_ENSURE_SUCCESS(rv, 1);
-
-    return 0;
+    return NS_FAILED(rv);
 }