From dc11620f89300f18df743c65d5f6afe0c081ee5d Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Tue, 23 May 2017 18:06:52 +0200
Subject: [PATCH] Bug 1359718 - Get rid of PBlob - part 5 - Fixing #includes,
 r=smaug

---
 dom/file/ipc/IPCBlobInputStream.cpp       | 4 ++--
 dom/file/ipc/IPCBlobInputStream.h         | 1 +
 dom/file/ipc/IPCBlobInputStreamChild.cpp  | 4 +++-
 dom/file/ipc/IPCBlobInputStreamParent.cpp | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dom/file/ipc/IPCBlobInputStream.cpp b/dom/file/ipc/IPCBlobInputStream.cpp
index f7bbe365f040..ce127dcedc44 100644
--- a/dom/file/ipc/IPCBlobInputStream.cpp
+++ b/dom/file/ipc/IPCBlobInputStream.cpp
@@ -7,8 +7,8 @@
 #include "IPCBlobInputStream.h"
 #include "IPCBlobInputStreamChild.h"
 #include "IPCBlobInputStreamStorage.h"
+#include "mozilla/ipc/InputStreamParams.h"
 #include "nsIAsyncInputStream.h"
-#include "mozilla/SystemGroup.h"
 
 namespace mozilla {
 namespace dom {
@@ -350,7 +350,7 @@ void
 IPCBlobInputStream::Serialize(mozilla::ipc::InputStreamParams& aParams,
                               FileDescriptorArray& aFileDescriptors)
 {
-  IPCBlobInputStreamParams params;
+  mozilla::ipc::IPCBlobInputStreamParams params;
   params.id() = mActor->ID();
 
   aParams = params;
diff --git a/dom/file/ipc/IPCBlobInputStream.h b/dom/file/ipc/IPCBlobInputStream.h
index b19fc55ebbd5..759a0200ad6b 100644
--- a/dom/file/ipc/IPCBlobInputStream.h
+++ b/dom/file/ipc/IPCBlobInputStream.h
@@ -12,6 +12,7 @@
 #include "nsIFileStreams.h"
 #include "nsIIPCSerializableInputStream.h"
 #include "nsISeekableStream.h"
+#include "nsCOMPtr.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/file/ipc/IPCBlobInputStreamChild.cpp b/dom/file/ipc/IPCBlobInputStreamChild.cpp
index 4e8379069261..96742b931c83 100644
--- a/dom/file/ipc/IPCBlobInputStreamChild.cpp
+++ b/dom/file/ipc/IPCBlobInputStreamChild.cpp
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "IPCBlobInputStreamChild.h"
+
+#include "mozilla/ipc/IPCStreamUtils.h"
 #include "WorkerHolder.h"
 
 namespace mozilla {
@@ -229,7 +231,7 @@ IPCBlobInputStreamChild::StreamNeeded(IPCBlobInputStream* aStream,
 mozilla::ipc::IPCResult
 IPCBlobInputStreamChild::RecvStreamReady(const OptionalIPCStream& aStream)
 {
-  nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
+  nsCOMPtr<nsIInputStream> stream = mozilla::ipc::DeserializeIPCStream(aStream);
 
   RefPtr<IPCBlobInputStream> pendingStream;
   nsCOMPtr<nsIEventTarget> eventTarget;
diff --git a/dom/file/ipc/IPCBlobInputStreamParent.cpp b/dom/file/ipc/IPCBlobInputStreamParent.cpp
index 837d5976fd0c..fc60f126cd11 100644
--- a/dom/file/ipc/IPCBlobInputStreamParent.cpp
+++ b/dom/file/ipc/IPCBlobInputStreamParent.cpp
@@ -6,6 +6,7 @@
 
 #include "IPCBlobInputStreamParent.h"
 #include "IPCBlobInputStreamStorage.h"
+#include "mozilla/ipc/IPCStreamUtils.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {
@@ -91,7 +92,7 @@ IPCBlobInputStreamParent::RecvStreamNeeded()
     return IPC_OK();
   }
 
-  AutoIPCStream ipcStream;
+  mozilla::ipc::AutoIPCStream ipcStream;
   bool ok = false;
 
   if (mContentManager) {