Bug 1274431: Fix some non-unified build issues. r=jld

ipc/glue/IPCMessageUtils.cpp

@@ -12,7 +12,7 @@ namespace IPC {
 bool
 ByteLengthIsValid(uint32_t aNumElements, size_t aElementSize, int* aByteLength)
 {
-  auto length = CheckedInt<int>(aNumElements) * aElementSize;
+  auto length = mozilla::CheckedInt<int>(aNumElements) * aElementSize;
   if (!length.isValid()) {
     return false;
   }

ipc/glue/IPCStreamUtils.cpp

@@ -10,11 +10,15 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/dom/PContentChild.h"
+#include "mozilla/dom/PContentParent.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/ipc/FileDescriptorSetChild.h"
 #include "mozilla/ipc/FileDescriptorSetParent.h"
+#include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/PBackgroundChild.h"
+#include "mozilla/ipc/PBackgroundParent.h"
 #include "mozilla/ipc/SendStream.h"
+#include "mozilla/unused.h"
 #include "nsIAsyncInputStream.h"
 
 namespace mozilla {
@@ -345,7 +349,7 @@ AutoIPCStream::~AutoIPCStream()
 }
 
 void
-AutoIPCStream::Serialize(nsIInputStream* aStream, PContentChild* aManager)
+AutoIPCStream::Serialize(nsIInputStream* aStream, dom::PContentChild* aManager)
 {
   MOZ_ASSERT(aStream);
   MOZ_ASSERT(aManager);

ipc/glue/MessageChannel.cpp

@@ -31,7 +31,7 @@ using mozilla::Move;
 #ifdef MOZ_B2G
 #define IPC_LOG(...)
 #else
-static LazyLogModule sLogModule("ipc");
+static mozilla::LazyLogModule sLogModule("ipc");
 #define IPC_LOG(...) MOZ_LOG(sLogModule, LogLevel::Debug, (__VA_ARGS__))
 #endif
 
@@ -97,6 +97,7 @@ static LazyLogModule sLogModule("ipc");
  */
 
 using namespace mozilla;
+using namespace mozilla::ipc;
 using namespace std;
 
 using mozilla::dom::AutoNoJSAPI;

ipc/glue/ProtocolUtils.cpp

@@ -10,10 +10,13 @@
 #include <errno.h>
 #endif
 
-#include "mozilla/ipc/MessageChannel.h"
 #include "mozilla/ipc/ProtocolUtils.h"
+
+#include "mozilla/dom/ContentParent.h"
+#include "mozilla/ipc/MessageChannel.h"
 #include "mozilla/ipc/Transport.h"
 #include "mozilla/StaticMutex.h"
+#include "nsPrintfCString.h"
 
 #if defined(MOZ_SANDBOX) && defined(XP_WIN)
 #define TARGET_SANDBOX_EXPORTS