Issue #80 - De-unify smaller netwerk/protocol components

- data
- device
- file
- viewsource
- wyciwyg

7 files changed, 8 insertions, 5 deletions

diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build
index 0958118fa..2c45b8067 100644
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.net += [
     'DataChannelParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'DataChannelChild.cpp',
     'DataChannelParent.cpp',
     'nsDataChannel.cpp',
diff --git a/netwerk/protocol/data/nsDataChannel.cpp b/netwerk/protocol/data/nsDataChannel.cpp
index 608a6c6e0..148a7901a 100644
--- a/netwerk/protocol/data/nsDataChannel.cpp
+++ b/netwerk/protocol/data/nsDataChannel.cpp
@@ -16,6 +16,7 @@
 #include "nsEscape.h"
 
 using namespace mozilla;
+using namespace mozilla::net;
 
 nsresult
 nsDataChannel::OpenContentStream(bool async, nsIInputStream **result,
diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build
index 3bb95930e..6900e725a 100644
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDeviceChannel.cpp',
     'nsDeviceProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index 223ff2f2b..c6be28ef2 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -15,7 +15,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp
index e55cb9d47..3896dabad 100644
--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
@@ -28,6 +28,8 @@
 #define DESKTOP_ENTRY_SECTION "Desktop Entry"
 #endif
 
+using namespace mozilla::net;
+
 //-----------------------------------------------------------------------------
 
 nsFileProtocolHandler::nsFileProtocolHandler()
diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build
index 4e3303c40..986ebf14e 100644
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -10,7 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index b043137f7..e5e02ce98 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -15,7 +15,7 @@ EXPORTS.mozilla.net += [
     'WyciwygChannelParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsWyciwyg.cpp',
     'nsWyciwygChannel.cpp',
     'nsWyciwygProtocolHandler.cpp',