Issue #80 - De-unify dom/network

7 files changed, 17 insertions, 2 deletions

diff --git a/dom/network/TCPServerSocketParent.cpp b/dom/network/TCPServerSocketParent.cpp
index 8f98d8b785..aec0ad1984 100644
--- a/dom/network/TCPServerSocketParent.cpp
+++ b/dom/network/TCPServerSocketParent.cpp
@@ -4,15 +4,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "TCPServerSocketParent.h"
+
 #include "nsIScriptSecurityManager.h"
+#include "TCPSocket.h"
 #include "TCPServerSocket.h"
-#include "TCPServerSocketParent.h"
 #include "nsJSUtils.h"
 #include "TCPSocketParent.h"
 #include "mozilla/Unused.h"
 #include "mozilla/AppProcessChecker.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/TabParent.h"
+#include "mozilla/dom/TCPServerSocketEvent.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/network/TCPSocket.cpp b/dom/network/TCPSocket.cpp
index 38827a9ac4..3f4fb696e5 100644
--- a/dom/network/TCPSocket.cpp
+++ b/dom/network/TCPSocket.cpp
@@ -6,7 +6,9 @@
 #include "mozilla/ErrorResult.h"
 #include "TCPSocket.h"
 #include "TCPServerSocket.h"
+#include "TCPSocketParent.h"
 #include "TCPSocketChild.h"
+#include "mozilla/Unused.h"
 #include "mozilla/dom/DOMError.h"
 #include "mozilla/dom/TCPSocketBinding.h"
 #include "mozilla/dom/TCPSocketErrorEvent.h"
diff --git a/dom/network/TCPSocketParent.cpp b/dom/network/TCPSocketParent.cpp
index 54167234e8..5fd53067df 100644
--- a/dom/network/TCPSocketParent.cpp
+++ b/dom/network/TCPSocketParent.cpp
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "TCPSocketParent.h"
+#include "TCPSocket.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "nsJSUtils.h"
diff --git a/dom/network/UDPSocket.cpp b/dom/network/UDPSocket.cpp
index e275e39029..3e18463ae2 100644
--- a/dom/network/UDPSocket.cpp
+++ b/dom/network/UDPSocket.cpp
@@ -17,6 +17,8 @@
 #include "nsINetAddr.h"
 #include "nsStringStream.h"
 
+using namespace mozilla::net;
+
 namespace mozilla {
 namespace dom {
 
diff --git a/dom/network/UDPSocketChild.cpp b/dom/network/UDPSocketChild.cpp
index d205e7e8a1..9d6ec09787 100644
--- a/dom/network/UDPSocketChild.cpp
+++ b/dom/network/UDPSocketChild.cpp
@@ -5,6 +5,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UDPSocketChild.h"
+
+#include "UDPSocket.h"
 #include "mozilla/Unused.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/net/NeckoChild.h"
diff --git a/dom/network/UDPSocketParent.cpp b/dom/network/UDPSocketParent.cpp
index 904a995ed4..2f258badb2 100644
--- a/dom/network/UDPSocketParent.cpp
+++ b/dom/network/UDPSocketParent.cpp
@@ -6,9 +6,11 @@
 
 #include "nsIServiceManager.h"
 #include "UDPSocketParent.h"
+#include "UDPSocket.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIUDPSocket.h"
 #include "nsINetAddr.h"
+#include "nsNetCID.h"
 #include "mozilla/AppProcessChecker.h"
 #include "mozilla/Unused.h"
 #include "mozilla/ipc/InputStreamUtils.h"
@@ -17,9 +19,12 @@
 #include "mozilla/net/PNeckoParent.h"
 #include "nsIPermissionManager.h"
 #include "nsIScriptSecurityManager.h"
+#include "mozilla/dom/ContentParent.h"
 #include "mozilla/ipc/PBackgroundParent.h"
 #include "mtransport/runnable_utils.h"
 
+using namespace mozilla::net;
+
 namespace mozilla {
 namespace dom {
 
diff --git a/dom/network/moz.build b/dom/network/moz.build
index ffb90d116c..79f8fe0097 100644
--- a/dom/network/moz.build
+++ b/dom/network/moz.build
@@ -27,7 +27,7 @@ EXPORTS.mozilla.dom.network += [
     'UDPSocketParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'Connection.cpp',
     'TCPServerSocket.cpp',
     'TCPServerSocketChild.cpp',