import changes from `dev' branch of rmottola/Arctic-Fox:

- put back some crash-reporter stff (f004751763)
- Bug 1138520 - Don't wait for ForceKill to finish (r=jchen) (de2281f03d)
- Bug 1141661 - Load chrome before processing delayed frame scripts. r=smaug (bbf2f89f6c)
- fix patch order issue (8852ce07c9)
- Bug 1111555 - Don't accidentally cancel downloads if we think we're exiting private browsing. r=ehsan (0adfab95bd)
- restore some crash-reporter stuff (90d37b8709)
- Bug 1142229, part 2 - Shut down the Nuwa process when its PContentParent::Close() is called. r=tlee (1002749bf5)
- Bug 1142229, part 1 - Clean up and refactor test cases for the Nuwa process. r=mrbkap (decea0f38d)
- Bug 1115496 - [DeviceStorage] Use change event to notify gaia if there is default location change. r=dhylands (b6bf095eb1)
- Bug 1186273 - Part 1. Move preferences and observers into dedicated threadsafe module. r=dhylands (5c8c091e71)
- Bug 1126694 - Test case. r=dhylands (29bd4893ef)
- Bug 1173484 - Fix race caused by adding new volumes. r=aosmond (7f7e034017)
- Bug 1186273 - Part 2. Improve reuse of and releasing of device storage objects where appropriate. r=dhylands (340dd77ede)
- Bug 974770 - Get rid of dom.mozInputMethod.testing in test scripts. r=kanru, r=mrbkap (88884a9cfd)
- Bug 994337 - Force sending strings over TCPSocket when strings are required. r=asuth (5b68048814)
- Bug 1176542 - Trace the window object in the TCPSocket child proxy. r=mccr8 (793e362a86)
- Bug 885982 - Part 1: Convert TCPSocket to WebIDL and rewrite in C++. r=asuth,mayhemer,bz Bug 885982 - Part 2: Convert TCPServerSocket to WebIDL and rewrite in C++. r=asuth,mayhemer,bz Bug 885982 - Part 3: Add e10s support to TCPSocket and TCPServerSocket. r=asuth,mayhemer,bz (2330a252e0)
- Bug 1154878. Stop exposing navigator.tainteEnabled in workers. r=ehsan (890912c45a)
- Bug 1192727 - Improve the way that Presentation receiver gets the ID of the incoming session. r=smaug (4655052a24)

dom/plugins/ipc/PluginModuleChild.cpp

@@ -37,6 +37,7 @@
 #include "mozilla/plugins/StreamNotifyChild.h"
 #include "mozilla/plugins/BrowserStreamChild.h"
 #include "mozilla/plugins/PluginStreamChild.h"
+#include "mozilla/dom/CrashReporterChild.h"
 #include "mozilla/unused.h"
 
 #include "nsNPAPIPlugin.h"
@@ -55,6 +56,9 @@
 
 using namespace mozilla;
 using namespace mozilla::plugins;
+using namespace mozilla::widget;
+using mozilla::dom::CrashReporterChild;
+using mozilla::dom::PCrashReporterChild;
 
 #if defined(XP_WIN)
 const wchar_t * kFlashFullscreenClass = L"ShockwaveFlashFullScreen";
@@ -64,7 +68,7 @@ const wchar_t * kMozillaWindowClass = L"MozillaWindowClass";
 namespace {
 // see PluginModuleChild::GetChrome()
 PluginModuleChild* gChromeInstance = nullptr;
-}
+} // namespace
 
 #ifdef MOZ_WIDGET_QT
 typedef void (*_gtk_init_fn)(int argc, char **argv);
@@ -793,6 +797,33 @@ PluginModuleChild::AllocPPluginModuleChild(mozilla::ipc::Transport* aTransport,
     return PluginModuleChild::CreateForContentProcess(aTransport, aOtherPid);
 }
 
+PCrashReporterChild*
+PluginModuleChild::AllocPCrashReporterChild(mozilla::dom::NativeThreadId* id,
+                                            uint32_t* processType)
+{
+    return new CrashReporterChild();
+}
+
+bool
+PluginModuleChild::DeallocPCrashReporterChild(PCrashReporterChild* actor)
+{
+    delete actor;
+    return true;
+}
+
+bool
+PluginModuleChild::AnswerPCrashReporterConstructor(
+        PCrashReporterChild* actor,
+        mozilla::dom::NativeThreadId* id,
+        uint32_t* processType)
+{
+#ifdef MOZ_CRASHREPORTER
+    *id = CrashReporter::CurrentThreadId();
+    *processType = XRE_GetProcessType();
+#endif
+    return true;
+}
+
 void
 PluginModuleChild::ActorDestroy(ActorDestroyReason why)
 {