Bug 938869 - Build layout/xul in unified mode; r=roc

layout/xul/base/src/moz.build

@@ -6,7 +6,7 @@
 
 MODULE = 'layout'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsBox.cpp',
     'nsBoxFrame.cpp',
     'nsBoxLayout.cpp',
@@ -26,7 +26,7 @@ SOURCES += [
 ]
 
 if CONFIG['MOZ_XUL']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsContainerBoxObject.cpp',
         'nsDeckFrame.cpp',
         'nsDocElementBoxFrame.cpp',

layout/xul/grid/moz.build

@@ -18,7 +18,7 @@ EXPORTS += [
     'nsIGridPart.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsGrid.cpp',
     'nsGridCell.cpp',
     'nsGridLayout2.cpp',

layout/xul/tree/moz.build

@@ -21,7 +21,7 @@ EXPORTS += [
     'nsTreeUtils.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsTreeBodyFrame.cpp',
     'nsTreeBoxObject.cpp',
     'nsTreeColFrame.cpp',

layout/xul/tree/nsTreeContentView.cpp

@@ -19,7 +19,7 @@
 #include "mozilla/dom/Element.h"
 #include "nsServiceManagerUtils.h"
 
-namespace dom = mozilla::dom;
+using namespace mozilla;
 
 #define NS_ENSURE_NATIVE_COLUMN(_col)                                \
   nsRefPtr<nsTreeColumn> col = nsTreeBodyFrame::GetColumnImpl(_col); \

layout/xul/tree/nsTreeUtils.cpp

@@ -12,7 +12,7 @@
 #include "nsGkAtoms.h"
 #include "nsINodeInfo.h"
 
-namespace dom = mozilla::dom;
+using namespace mozilla;
 
 nsresult
 nsTreeUtils::TokenizeProperties(const nsAString& aProperties, AtomArray & aPropertiesArray)