Backed out changeset 58cc2991c47a (bug 1359718)

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)
 {
-  mozilla::ipc::IPCBlobInputStreamParams params;
+  IPCBlobInputStreamParams params;
   params.id() = mActor->ID();
 
   aParams = params;

dom/file/ipc/IPCBlobInputStream.h

@@ -12,7 +12,6 @@
 #include "nsIFileStreams.h"
 #include "nsIIPCSerializableInputStream.h"
 #include "nsISeekableStream.h"
-#include "nsCOMPtr.h"
 
 namespace mozilla {
 namespace dom {

dom/file/ipc/IPCBlobInputStreamChild.cpp

@@ -5,8 +5,6 @@
  * 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 {
@@ -231,7 +229,7 @@ IPCBlobInputStreamChild::StreamNeeded(IPCBlobInputStream* aStream,
 mozilla::ipc::IPCResult
 IPCBlobInputStreamChild::RecvStreamReady(const OptionalIPCStream& aStream)
 {
-  nsCOMPtr<nsIInputStream> stream = mozilla::ipc::DeserializeIPCStream(aStream);
+  nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
 
   RefPtr<IPCBlobInputStream> pendingStream;
   nsCOMPtr<nsIEventTarget> eventTarget;

dom/file/ipc/IPCBlobInputStreamParent.cpp

@@ -6,7 +6,6 @@
 
 #include "IPCBlobInputStreamParent.h"
 #include "IPCBlobInputStreamStorage.h"
-#include "mozilla/ipc/IPCStreamUtils.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {
@@ -92,7 +91,7 @@ IPCBlobInputStreamParent::RecvStreamNeeded()
     return IPC_OK();
   }
 
-  mozilla::ipc::AutoIPCStream ipcStream;
+  AutoIPCStream ipcStream;
   bool ok = false;
 
   if (mContentManager) {