Merge mozilla-central to inbound. a=merge CLOSED TREE

2019-03-01 09:28:28 +02:00
parent 5492315043 4f8d649bc8
commit ace66df7fd
203 changed files with 2045 additions and 3108 deletions
--- a/netwerk/ipc/SocketProcessChild.cpp
+++ b/netwerk/ipc/SocketProcessChild.cpp
@@ -109,7 +109,8 @@ IPCResult SocketProcessChild::RecvPreferenceUpdate(const Pref& aPref) {

 mozilla::ipc::IPCResult SocketProcessChild::RecvRequestMemoryReport(
    const uint32_t& aGeneration, const bool& aAnonymize,
-    const bool& aMinimizeMemoryUsage, const MaybeFileDesc& aDMDFile) {
+    const bool& aMinimizeMemoryUsage,
+    const Maybe<ipc::FileDescriptor>& aDMDFile) {
  nsPrintfCString processName("SocketProcess");

  mozilla::dom::MemoryReportRequestClient::Start(