diff --git a/ipc/glue/CrashReporterHost.cpp b/ipc/glue/CrashReporterHost.cpp index 6645f556941de..a0db28f97df9f 100644 --- a/ipc/glue/CrashReporterHost.cpp +++ b/ipc/glue/CrashReporterHost.cpp @@ -77,8 +77,8 @@ RefPtr CrashReporterHost::TakeCrashedChildMinidump( MOZ_ASSERT(!HasMinidump()); RefPtr crashDump; - if (!XRE_TakeMinidumpForChild(aPid, getter_AddRefs(crashDump), - aOutSequence)) { + if (!CrashReporter::TakeMinidumpForChild(aPid, getter_AddRefs(crashDump), + aOutSequence)) { return nullptr; } if (!AdoptMinidump(crashDump)) { diff --git a/ipc/glue/ProtocolUtils.cpp b/ipc/glue/ProtocolUtils.cpp index db7165f3b1417..7448996a86ddd 100644 --- a/ipc/glue/ProtocolUtils.cpp +++ b/ipc/glue/ProtocolUtils.cpp @@ -604,11 +604,6 @@ void IToplevelProtocol::SetOtherProcessId(base::ProcessId aOtherPid) { } } -bool IToplevelProtocol::TakeMinidump(nsIFile** aDump, uint32_t* aSequence) { - MOZ_RELEASE_ASSERT(GetSide() == ParentSide); - return XRE_TakeMinidumpForChild(OtherPid(), aDump, aSequence); -} - bool IToplevelProtocol::Open(mozilla::ipc::Transport* aTransport, base::ProcessId aOtherPid, MessageLoop* aThread, mozilla::ipc::Side aSide) { diff --git a/ipc/glue/ProtocolUtils.h b/ipc/glue/ProtocolUtils.h index a3ca2a92e7c7e..f0c642c7b57cc 100644 --- a/ipc/glue/ProtocolUtils.h +++ b/ipc/glue/ProtocolUtils.h @@ -467,8 +467,6 @@ class IToplevelProtocol : public IProtocol { base::ProcessId OtherPid() const final; void SetOtherProcessId(base::ProcessId aOtherPid); - bool TakeMinidump(nsIFile** aDump, uint32_t* aSequence); - virtual void OnChannelClose() = 0; virtual void OnChannelError() = 0; virtual void ProcessingError(Result aError, const char* aMsgName) {} diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index fc1c76160380a..96b4dc19c2f40 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -262,14 +262,6 @@ void XRE_SetProcessType(const char* aProcessTypeString) { } } -// FIXME/bug 539522: this out-of-place function is stuck here because -// IPDL wants access to this crashreporter interface, and -// crashreporter is built in such a way to make that awkward -bool XRE_TakeMinidumpForChild(uint32_t aChildPid, nsIFile** aDump, - uint32_t* aSequence) { - return CrashReporter::TakeMinidumpForChild(aChildPid, aDump, aSequence); -} - bool #if defined(XP_WIN) XRE_SetRemoteExceptionHandler(const char* aPipe /*= 0*/, diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h index bad8044e0f66a..19ad7fe2d0d0c 100644 --- a/xpcom/build/nsXULAppAPI.h +++ b/xpcom/build/nsXULAppAPI.h @@ -401,10 +401,6 @@ XRE_API(void, XRE_SetAndroidChildFds, XRE_API(void, XRE_SetProcessType, (const char* aProcessTypeString)) -// Used in the "master" parent process hosting the crash server -XRE_API(bool, XRE_TakeMinidumpForChild, - (uint32_t aChildPid, nsIFile** aDump, uint32_t* aSequence)) - // Used in child processes. #if defined(XP_WIN) // Uses uintptr_t, even though it's really a HANDLE, because including