mozilla-central: changeset 198202:a7180856b416f85cdf10e026e02db9e93edb4a8d

--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -326,16 +326,17 @@
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
 @BINPATH@/components/xpcom_threads.xpt
 @BINPATH@/components/xpcom_xpti.xpt
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xul.xpt
+@BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 
 ; JavaScript components
 @BINPATH@/components/ChromeNotifications.js
 @BINPATH@/components/ChromeNotifications.manifest
 @BINPATH@/components/ConsoleAPI.manifest
 @BINPATH@/components/ConsoleAPIStorage.js

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -326,16 +326,17 @@
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
 @BINPATH@/components/xpcom_threads.xpt
 @BINPATH@/components/xpcom_xpti.xpt
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xul.xpt
+@BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 @BINPATH@/components/telemetry.xpt
 
 ; JavaScript components
 @BINPATH@/components/ChromeNotifications.js
 @BINPATH@/components/ChromeNotifications.manifest
 @BINPATH@/components/ConsoleAPI.manifest

--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -208,25 +208,26 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/caps',
     '/content/html/content/src',
     '/content/html/document/src',
+    '/content/xul/content/src',
+    '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/dom/svg',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xml',
     '/dom/xslt/xpath',
-    '/dom/xul',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',

--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -169,20 +169,20 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/media/',
+    '/content/xul/content/src',
     '/dom/base',
     '/dom/canvas',
     '/dom/xbl',
-    '/dom/xul',
     '/editor/libeditor/base',
     '/editor/libeditor/text',
     '/editor/txmgr',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',

--- a/content/moz.build
+++ b/content/moz.build
@@ -3,11 +3,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 DIRS += [
     'base',
     'html',
     'media',
+    'xul',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

rename from dom/xul/crashtests/107518-1.xml
rename to content/xul/content/crashtests/107518-1.xml

rename from dom/xul/crashtests/252448-1.xul
rename to content/xul/content/crashtests/252448-1.xul

rename from dom/xul/crashtests/253479-1.xul
rename to content/xul/content/crashtests/253479-1.xul

rename from dom/xul/crashtests/253479-2.xul
rename to content/xul/content/crashtests/253479-2.xul

rename from dom/xul/crashtests/326644-1-inner.xul
rename to content/xul/content/crashtests/326644-1-inner.xul

rename from dom/xul/crashtests/326644-1.html
rename to content/xul/content/crashtests/326644-1.html

rename from dom/xul/crashtests/326644-2-inner.xul
rename to content/xul/content/crashtests/326644-2-inner.xul

rename from dom/xul/crashtests/326644-2.html
rename to content/xul/content/crashtests/326644-2.html

rename from dom/xul/crashtests/326864-1.xul
rename to content/xul/content/crashtests/326864-1.xul

rename from dom/xul/crashtests/326875-1.xul
rename to content/xul/content/crashtests/326875-1.xul

rename from dom/xul/crashtests/326881-1.xul
rename to content/xul/content/crashtests/326881-1.xul

rename from dom/xul/crashtests/329982-1.xhtml
rename to content/xul/content/crashtests/329982-1.xhtml

rename from dom/xul/crashtests/336096-1.xhtml
rename to content/xul/content/crashtests/336096-1.xhtml

rename from dom/xul/crashtests/354611-1.html
rename to content/xul/content/crashtests/354611-1.html

rename from dom/xul/crashtests/360078-1.xhtml
rename to content/xul/content/crashtests/360078-1.xhtml

rename from dom/xul/crashtests/360078-1xbl.xml
rename to content/xul/content/crashtests/360078-1xbl.xml

rename from dom/xul/crashtests/363791-1.xul
rename to content/xul/content/crashtests/363791-1.xul

rename from dom/xul/crashtests/384740-1.xul
rename to content/xul/content/crashtests/384740-1.xul

rename from dom/xul/crashtests/384877-1-inner.xul
rename to content/xul/content/crashtests/384877-1-inner.xul

rename from dom/xul/crashtests/384877-1.html
rename to content/xul/content/crashtests/384877-1.html

rename from dom/xul/crashtests/386947-1.xul
rename to content/xul/content/crashtests/386947-1.xul

rename from dom/xul/crashtests/425821-1.xul
rename to content/xul/content/crashtests/425821-1.xul

rename from dom/xul/crashtests/429085-1.xhtml
rename to content/xul/content/crashtests/429085-1.xhtml

rename from dom/xul/crashtests/431906-1-inner.xul
rename to content/xul/content/crashtests/431906-1-inner.xul

rename from dom/xul/crashtests/431906-1.html
rename to content/xul/content/crashtests/431906-1.html

rename from dom/xul/crashtests/451311-1.xul
rename to content/xul/content/crashtests/451311-1.xul

rename from dom/xul/crashtests/461917-1.xhtml
rename to content/xul/content/crashtests/461917-1.xhtml

rename from dom/xul/crashtests/509719-1-overlay.xul
rename to content/xul/content/crashtests/509719-1-overlay.xul

rename from dom/xul/crashtests/509719-1.xul
rename to content/xul/content/crashtests/509719-1.xul

rename from dom/xul/crashtests/509719-2-overlay.xul
rename to content/xul/content/crashtests/509719-2-overlay.xul

rename from dom/xul/crashtests/509719-2.xul
rename to content/xul/content/crashtests/509719-2.xul

rename from dom/xul/crashtests/crashtests.list
rename to content/xul/content/crashtests/crashtests.list
--- a/dom/xul/crashtests/crashtests.list
+++ b/content/xul/content/crashtests/crashtests.list
@@ -1,33 +1,24 @@
 load 107518-1.xml
 load 252448-1.xul
 load 253479-1.xul
 load 253479-2.xul
-load 326204-1.xul
 load 326644-1.html
 load 326644-2.html
 load 326864-1.xul
 load 326875-1.xul
 load 326881-1.xul
 load 329982-1.xhtml
 load 336096-1.xhtml
-load 344215-1.xul
 load 354611-1.html
 load 360078-1.xhtml
 load 363791-1.xul
 load 384740-1.xul
 load 384877-1.html
-load 386914-1.html
 load 386947-1.xul
 load 425821-1.xul
-load 428951-1.xul
 load 429085-1.xhtml
 load 431906-1.html
 load 451311-1.xul
 load 461917-1.xhtml
-load 468211-1.xul
-load 468211-2.xul
-load 468211-3.xul
-load 495635-1.xul
 load 509719-1.xul
 asserts(3) load 509719-2.xul # bug 909819
-load 583230.xul

new file mode 100644
--- /dev/null
+++ b/content/xul/content/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+DIRS += ['public', 'src']
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']

new file mode 100644
--- /dev/null
+++ b/content/xul/content/public/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+if CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsIXULContextMenuBuilder.idl',
+    ]
+
+XPIDL_MODULE = 'xul'
+

rename from dom/xul/nsIXULContextMenuBuilder.idl
rename to content/xul/content/public/nsIXULContextMenuBuilder.idl

new file mode 100644
--- /dev/null
+++ b/content/xul/content/src/moz.build
@@ -0,0 +1,30 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+if CONFIG['MOZ_XUL']:
+    MSVC_ENABLE_PGO = True
+
+    UNIFIED_SOURCES += [
+        'nsXULContextMenuBuilder.cpp',
+        'nsXULElement.cpp',
+        'nsXULPopupListener.cpp',
+    ]
+
+FAIL_ON_WARNINGS = True
+
+LOCAL_INCLUDES += [
+    '../../document/src',
+    '../../templates/src',
+    '/content/base/src',
+    '/content/html/content/src',
+    '/dom/xbl',
+    '/dom/xml',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/xul',
+]
+
+FINAL_LIBRARY = 'xul'

rename from dom/xul/nsXULContextMenuBuilder.cpp
rename to content/xul/content/src/nsXULContextMenuBuilder.cpp

rename from dom/xul/nsXULContextMenuBuilder.h
rename to content/xul/content/src/nsXULContextMenuBuilder.h

rename from dom/xul/nsXULElement.cpp
rename to content/xul/content/src/nsXULElement.cpp

rename from dom/xul/nsXULElement.h
rename to content/xul/content/src/nsXULElement.h

rename from dom/xul/nsXULPopupListener.cpp
rename to content/xul/content/src/nsXULPopupListener.cpp

rename from dom/xul/nsXULPopupListener.h
rename to content/xul/content/src/nsXULPopupListener.h

rename from dom/xul/test/398289-resource.xul
rename to content/xul/content/test/398289-resource.xul

rename from dom/xul/test/chrome.ini
rename to content/xul/content/test/chrome.ini
--- a/dom/xul/test/chrome.ini
+++ b/content/xul/content/test/chrome.ini
@@ -1,29 +1,10 @@
 [DEFAULT]
 support-files =
   398289-resource.xul
-  bug497875-iframe.xul
   file_bug236853.rdf
-  overlay1_bug335375.xul
-  overlay2_bug335375.xul
-  window_bug583948.xul
-  window_bug757137.xul
 
-[test_bug199692.xul]
 [test_bug233643.xul]
 [test_bug236853.xul]
-[test_bug311681.xul]
-[test_bug335375.xul]
-[test_bug391002.xul]
 [test_bug398289.html]
-[test_bug403868.xul]
-[test_bug414907.xul]
-[test_bug418216.xul]
-[test_bug445177.xul]
-[test_bug449457.xul]
-[test_bug468176.xul]
-[test_bug497875.xul]
-[test_bug583948.xul]
-[test_bug640158_overlay_persist.xul]
-[test_bug757137.xul]
 [test_bug775972.xul]
 [test_import_xul_to_content.xul]

rename from dom/xul/test/file_bug236853.rdf
rename to content/xul/content/test/file_bug236853.rdf

rename from dom/xul/test/mochitest.ini
rename to content/xul/content/test/mochitest.ini

rename from dom/xul/test/test_bug233643.xul
rename to content/xul/content/test/test_bug233643.xul

rename from dom/xul/test/test_bug236853.xul
rename to content/xul/content/test/test_bug236853.xul

rename from dom/xul/test/test_bug398289.html
rename to content/xul/content/test/test_bug398289.html

rename from dom/xul/test/test_bug486990.xul
rename to content/xul/content/test/test_bug486990.xul

rename from dom/xul/test/test_bug749367.xul
rename to content/xul/content/test/test_bug749367.xul

rename from dom/xul/test/test_bug775972.xul
rename to content/xul/content/test/test_bug775972.xul

rename from dom/xul/test/test_import_xul_to_content.xul
rename to content/xul/content/test/test_import_xul_to_content.xul

rename from dom/xul/crashtests/326204-1.xul
rename to content/xul/document/crashtests/326204-1.xul

rename from dom/xul/crashtests/344215-1.xul
rename to content/xul/document/crashtests/344215-1.xul

rename from dom/xul/crashtests/386914-1-inner.xul
rename to content/xul/document/crashtests/386914-1-inner.xul

rename from dom/xul/crashtests/386914-1.html
rename to content/xul/document/crashtests/386914-1.html

rename from dom/xul/crashtests/428951-1.xul
rename to content/xul/document/crashtests/428951-1.xul

rename from dom/xul/crashtests/468211-1.xul
rename to content/xul/document/crashtests/468211-1.xul

rename from dom/xul/crashtests/468211-2-binding.xml
rename to content/xul/document/crashtests/468211-2-binding.xml

rename from dom/xul/crashtests/468211-2.xul
rename to content/xul/document/crashtests/468211-2.xul

rename from dom/xul/crashtests/468211-3.xul
rename to content/xul/document/crashtests/468211-3.xul

rename from dom/xul/crashtests/495635-1.xul
rename to content/xul/document/crashtests/495635-1.xul

rename from dom/xul/crashtests/583230.xul
rename to content/xul/document/crashtests/583230.xul

new file mode 100644
--- /dev/null
+++ b/content/xul/document/crashtests/crashtests.list
@@ -0,0 +1,9 @@
+load 326204-1.xul
+load 344215-1.xul
+load 386914-1.html
+load 428951-1.xul
+load 468211-1.xul
+load 468211-2.xul
+load 468211-3.xul
+load 495635-1.xul
+load 583230.xul

rename from dom/xul/crashtests/extA1.xul
rename to content/xul/document/crashtests/extA1.xul

rename from dom/xul/crashtests/extA2.xul
rename to content/xul/document/crashtests/extA2.xul

rename from dom/xul/crashtests/extB1.xul
rename to content/xul/document/crashtests/extB1.xul

new file mode 100644
--- /dev/null
+++ b/content/xul/document/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+DIRS += ['public', 'src']
+
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']

new file mode 100644
--- /dev/null
+++ b/content/xul/document/public/moz.build
@@ -0,0 +1,21 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+XPIDL_SOURCES += [
+    'nsIController.idl',
+    'nsIControllers.idl',
+]
+
+if CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsIXULOverlayProvider.idl',
+    ]
+    EXPORTS += [
+        'nsIXULDocument.h',
+    ]
+
+XPIDL_MODULE = 'xuldoc'
+

rename from dom/xul/nsIController.idl
rename to content/xul/document/public/nsIController.idl

rename from dom/xul/nsIControllers.idl
rename to content/xul/document/public/nsIControllers.idl

rename from dom/xul/nsIXULDocument.h
rename to content/xul/document/public/nsIXULDocument.h

rename from dom/xul/nsIXULOverlayProvider.idl
rename to content/xul/document/public/nsIXULOverlayProvider.idl

rename from dom/xul/XULDocument.cpp
rename to content/xul/document/src/XULDocument.cpp

rename from dom/xul/XULDocument.h
rename to content/xul/document/src/XULDocument.h

new file mode 100644
--- /dev/null
+++ b/content/xul/document/src/moz.build
@@ -0,0 +1,38 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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 += [
+    'nsXULControllers.cpp',
+]
+
+if CONFIG['MOZ_XUL']:
+    UNIFIED_SOURCES += [
+        'nsXULCommandDispatcher.cpp',
+        'nsXULContentSink.cpp',
+        'nsXULPrototypeCache.cpp',
+        'nsXULPrototypeDocument.cpp',
+        'XULDocument.cpp',
+    ]
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/xul/content/src',
+    '/content/xul/templates/src',
+    '/docshell/base',
+    '/dom/base',
+    '/dom/xbl',
+    '/dom/xml',
+    '/layout/base',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/xul',
+]
+
+FINAL_LIBRARY = 'xul'

rename from dom/xul/nsForwardReference.h
rename to content/xul/document/src/nsForwardReference.h

rename from dom/xul/nsXULCommandDispatcher.cpp
rename to content/xul/document/src/nsXULCommandDispatcher.cpp

rename from dom/xul/nsXULCommandDispatcher.h
rename to content/xul/document/src/nsXULCommandDispatcher.h

rename from dom/xul/nsXULContentSink.cpp
rename to content/xul/document/src/nsXULContentSink.cpp

rename from dom/xul/nsXULContentSink.h
rename to content/xul/document/src/nsXULContentSink.h

rename from dom/xul/nsXULControllers.cpp
rename to content/xul/document/src/nsXULControllers.cpp

rename from dom/xul/nsXULControllers.h
rename to content/xul/document/src/nsXULControllers.h

rename from dom/xul/nsXULPrototypeCache.cpp
rename to content/xul/document/src/nsXULPrototypeCache.cpp

rename from dom/xul/nsXULPrototypeCache.h
rename to content/xul/document/src/nsXULPrototypeCache.h

rename from dom/xul/nsXULPrototypeDocument.cpp
rename to content/xul/document/src/nsXULPrototypeDocument.cpp

rename from dom/xul/nsXULPrototypeDocument.h
rename to content/xul/document/src/nsXULPrototypeDocument.h

rename from dom/xul/test/bug497875-iframe.xul
rename to content/xul/document/test/bug497875-iframe.xul

new file mode 100644
--- /dev/null
+++ b/content/xul/document/test/chrome.ini
@@ -0,0 +1,22 @@
+[DEFAULT]
+support-files =
+  bug497875-iframe.xul
+  overlay1_bug335375.xul
+  overlay2_bug335375.xul
+  window_bug583948.xul
+  window_bug757137.xul
+
+[test_bug199692.xul]
+[test_bug311681.xul]
+[test_bug335375.xul]
+[test_bug391002.xul]
+[test_bug403868.xul]
+[test_bug414907.xul]
+[test_bug418216.xul]
+[test_bug445177.xul]
+[test_bug449457.xul]
+[test_bug468176.xul]
+[test_bug497875.xul]
+[test_bug583948.xul]
+[test_bug640158_overlay_persist.xul]
+[test_bug757137.xul]

rename from dom/xul/test/overlay1_bug335375.xul
rename to content/xul/document/test/overlay1_bug335375.xul

rename from dom/xul/test/overlay2_bug335375.xul
rename to content/xul/document/test/overlay2_bug335375.xul

rename from dom/xul/test/overlay_640158.xul
rename to content/xul/document/test/overlay_640158.xul

rename from dom/xul/test/test_bug199692.xul
rename to content/xul/document/test/test_bug199692.xul

rename from dom/xul/test/test_bug311681.xul
rename to content/xul/document/test/test_bug311681.xul

rename from dom/xul/test/test_bug335375.xul
rename to content/xul/document/test/test_bug335375.xul

rename from dom/xul/test/test_bug391002.xul
rename to content/xul/document/test/test_bug391002.xul

rename from dom/xul/test/test_bug403868.xul
rename to content/xul/document/test/test_bug403868.xul

rename from dom/xul/test/test_bug414907.xul
rename to content/xul/document/test/test_bug414907.xul

rename from dom/xul/test/test_bug418216.xul
rename to content/xul/document/test/test_bug418216.xul

rename from dom/xul/test/test_bug445177.xul
rename to content/xul/document/test/test_bug445177.xul

rename from dom/xul/test/test_bug449457.xul
rename to content/xul/document/test/test_bug449457.xul

rename from dom/xul/test/test_bug468176.xul
rename to content/xul/document/test/test_bug468176.xul

rename from dom/xul/test/test_bug497875.xul
rename to content/xul/document/test/test_bug497875.xul

rename from dom/xul/test/test_bug583948.xul
rename to content/xul/document/test/test_bug583948.xul

rename from dom/xul/test/test_bug640158_overlay_persist.xul
rename to content/xul/document/test/test_bug640158_overlay_persist.xul

rename from dom/xul/test/test_bug757137.xul
rename to content/xul/document/test/test_bug757137.xul

rename from dom/xul/test/window_bug583948.xul
rename to content/xul/document/test/window_bug583948.xul

rename from dom/xul/test/window_bug757137.xul
rename to content/xul/document/test/window_bug757137.xul

rename from dom/xul/moz.build
rename to content/xul/moz.build
--- a/dom/xul/moz.build
+++ b/content/xul/moz.build
@@ -1,64 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
+# We need to build document even if XUL is disabled, for the nsIController[s]
+# interfaces and implementations.
+# Likewise for content, because of nsXULAtoms.
+DIRS += ['document', 'content']
+
 if CONFIG['MOZ_XUL']:
     DIRS += ['templates']
 
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
-
-XPIDL_SOURCES += [
-    'nsIController.idl',
-    'nsIControllers.idl',
-]
-
-if CONFIG['MOZ_XUL']:
-    XPIDL_SOURCES += [
-        'nsIXULContextMenuBuilder.idl',
-        'nsIXULOverlayProvider.idl',
-    ]
-    EXPORTS += [
-        'nsIXULDocument.h',
-    ]
-
-
-UNIFIED_SOURCES += [
-    'nsXULControllers.cpp',
-]
-
-if CONFIG['MOZ_XUL']:
-    UNIFIED_SOURCES += [
-        'nsXULCommandDispatcher.cpp',
-        'nsXULContentSink.cpp',
-        'nsXULContextMenuBuilder.cpp',
-        'nsXULElement.cpp',
-        'nsXULPopupListener.cpp',
-        'nsXULPrototypeCache.cpp',
-        'nsXULPrototypeDocument.cpp',
-        'XULDocument.cpp',
-    ]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '/content/base/src',
-    '/content/html/content/src',
-    '/docshell/base',
-    '/dom/base',
-    '/dom/xbl',
-    '/dom/xml',
-    '/dom/xul/templates',
-    '/layout/base',
-    '/layout/generic',
-    '/layout/style',
-    '/layout/xul',
-]
-
-FINAL_LIBRARY = 'xul'
-
-XPIDL_MODULE = 'xul'

rename from dom/xul/templates/moz.build
rename to content/xul/templates/moz.build
--- a/dom/xul/templates/moz.build
+++ b/content/xul/templates/moz.build
@@ -1,58 +1,9 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
-MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
-
-XPIDL_SOURCES += [
-    'nsIXULBuilderListener.idl',
-    'nsIXULSortService.idl',
-    'nsIXULTemplateBuilder.idl',
-    'nsIXULTemplateQueryProcessor.idl',
-    'nsIXULTemplateResult.idl',
-    'nsIXULTemplateRuleFilter.idl',
-]
-
-XPIDL_MODULE = 'xultmpl'
+DIRS += ['public', 'src']
 
-UNIFIED_SOURCES += [
-    'nsContentSupportMap.cpp',
-    'nsContentTestNode.cpp',
-    'nsInstantiationNode.cpp',
-    'nsRDFBinding.cpp',
-    'nsRDFConInstanceTestNode.cpp',
-    'nsRDFConMemberTestNode.cpp',
-    'nsRDFPropertyTestNode.cpp',
-    'nsRDFQuery.cpp',
-    'nsResourceSet.cpp',
-    'nsRuleNetwork.cpp',
-    'nsTemplateMatch.cpp',
-    'nsTemplateRule.cpp',
-    'nsTreeRows.cpp',
-    'nsXMLBinding.cpp',
-    'nsXULContentBuilder.cpp',
-    'nsXULContentUtils.cpp',
-    'nsXULSortService.cpp',
-    'nsXULTemplateBuilder.cpp',
-    'nsXULTemplateQueryProcessorRDF.cpp',
-    'nsXULTemplateQueryProcessorStorage.cpp',
-    'nsXULTemplateQueryProcessorXML.cpp',
-    'nsXULTemplateResultRDF.cpp',
-    'nsXULTemplateResultSetRDF.cpp',
-    'nsXULTemplateResultStorage.cpp',
-    'nsXULTemplateResultXML.cpp',
-    'nsXULTreeBuilder.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '/content/base/src',
-    '/dom/base',
-    '/dom/xul',
-    '/layout/xul/tree/',
-]
-
-FINAL_LIBRARY = 'xul'
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']

new file mode 100644
--- /dev/null
+++ b/content/xul/templates/public/moz.build
@@ -0,0 +1,17 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+XPIDL_SOURCES += [
+    'nsIXULBuilderListener.idl',
+    'nsIXULSortService.idl',
+    'nsIXULTemplateBuilder.idl',
+    'nsIXULTemplateQueryProcessor.idl',
+    'nsIXULTemplateResult.idl',
+    'nsIXULTemplateRuleFilter.idl',
+]
+
+XPIDL_MODULE = 'xultmpl'
+

rename from dom/xul/templates/nsIXULBuilderListener.idl
rename to content/xul/templates/public/nsIXULBuilderListener.idl

rename from dom/xul/templates/nsIXULSortService.idl
rename to content/xul/templates/public/nsIXULSortService.idl

rename from dom/xul/templates/nsIXULTemplateBuilder.idl
rename to content/xul/templates/public/nsIXULTemplateBuilder.idl

rename from dom/xul/templates/nsIXULTemplateQueryProcessor.idl
rename to content/xul/templates/public/nsIXULTemplateQueryProcessor.idl

rename from dom/xul/templates/nsIXULTemplateResult.idl
rename to content/xul/templates/public/nsIXULTemplateResult.idl

rename from dom/xul/templates/nsIXULTemplateRuleFilter.idl
rename to content/xul/templates/public/nsIXULTemplateRuleFilter.idl

rename from dom/xul/templates/crashtests/257752-1-recursion.rdf
rename to content/xul/templates/src/crashtests/257752-1-recursion.rdf

rename from dom/xul/templates/crashtests/257752-1-recursion.xul
rename to content/xul/templates/src/crashtests/257752-1-recursion.xul

rename from dom/xul/templates/crashtests/329884-1.xul
rename to content/xul/templates/src/crashtests/329884-1.xul

rename from dom/xul/templates/crashtests/330012-1.rdf
rename to content/xul/templates/src/crashtests/330012-1.rdf

rename from dom/xul/templates/crashtests/330012-1.xul
rename to content/xul/templates/src/crashtests/330012-1.xul

rename from dom/xul/templates/crashtests/404346-1.xul
rename to content/xul/templates/src/crashtests/404346-1.xul

rename from dom/xul/templates/crashtests/415019-1.xul
rename to content/xul/templates/src/crashtests/415019-1.xul

rename from dom/xul/templates/crashtests/417840-1.xul
rename to content/xul/templates/src/crashtests/417840-1.xul

rename from dom/xul/templates/crashtests/424418-1.xul
rename to content/xul/templates/src/crashtests/424418-1.xul

rename from dom/xul/templates/crashtests/crashtests.list
rename to content/xul/templates/src/crashtests/crashtests.list

new file mode 100644
--- /dev/null
+++ b/content/xul/templates/src/moz.build
@@ -0,0 +1,45 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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 += [
+    'nsContentSupportMap.cpp',
+    'nsContentTestNode.cpp',
+    'nsInstantiationNode.cpp',
+    'nsRDFBinding.cpp',
+    'nsRDFConInstanceTestNode.cpp',
+    'nsRDFConMemberTestNode.cpp',
+    'nsRDFPropertyTestNode.cpp',
+    'nsRDFQuery.cpp',
+    'nsResourceSet.cpp',
+    'nsRuleNetwork.cpp',
+    'nsTemplateMatch.cpp',
+    'nsTemplateRule.cpp',
+    'nsTreeRows.cpp',
+    'nsXMLBinding.cpp',
+    'nsXULContentBuilder.cpp',
+    'nsXULContentUtils.cpp',
+    'nsXULSortService.cpp',
+    'nsXULTemplateBuilder.cpp',
+    'nsXULTemplateQueryProcessorRDF.cpp',
+    'nsXULTemplateQueryProcessorStorage.cpp',
+    'nsXULTemplateQueryProcessorXML.cpp',
+    'nsXULTemplateResultRDF.cpp',
+    'nsXULTemplateResultSetRDF.cpp',
+    'nsXULTemplateResultStorage.cpp',
+    'nsXULTemplateResultXML.cpp',
+    'nsXULTreeBuilder.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+LOCAL_INCLUDES += [
+    '../../content/src',
+    '/content/base/src',
+    '/dom/base',
+    '/layout/xul/tree/',
+]
+
+FINAL_LIBRARY = 'xul'

rename from dom/xul/templates/nsContentSupportMap.cpp
rename to content/xul/templates/src/nsContentSupportMap.cpp

rename from dom/xul/templates/nsContentSupportMap.h
rename to content/xul/templates/src/nsContentSupportMap.h

rename from dom/xul/templates/nsContentTestNode.cpp
rename to content/xul/templates/src/nsContentTestNode.cpp

rename from dom/xul/templates/nsContentTestNode.h
rename to content/xul/templates/src/nsContentTestNode.h

rename from dom/xul/templates/nsInstantiationNode.cpp
rename to content/xul/templates/src/nsInstantiationNode.cpp

rename from dom/xul/templates/nsInstantiationNode.h
rename to content/xul/templates/src/nsInstantiationNode.h

rename from dom/xul/templates/nsRDFBinding.cpp
rename to content/xul/templates/src/nsRDFBinding.cpp

rename from dom/xul/templates/nsRDFBinding.h
rename to content/xul/templates/src/nsRDFBinding.h

rename from dom/xul/templates/nsRDFConInstanceTestNode.cpp
rename to content/xul/templates/src/nsRDFConInstanceTestNode.cpp

rename from dom/xul/templates/nsRDFConInstanceTestNode.h
rename to content/xul/templates/src/nsRDFConInstanceTestNode.h

rename from dom/xul/templates/nsRDFConMemberTestNode.cpp
rename to content/xul/templates/src/nsRDFConMemberTestNode.cpp

rename from dom/xul/templates/nsRDFConMemberTestNode.h
rename to content/xul/templates/src/nsRDFConMemberTestNode.h

rename from dom/xul/templates/nsRDFPropertyTestNode.cpp
rename to content/xul/templates/src/nsRDFPropertyTestNode.cpp

rename from dom/xul/templates/nsRDFPropertyTestNode.h
rename to content/xul/templates/src/nsRDFPropertyTestNode.h

rename from dom/xul/templates/nsRDFQuery.cpp
rename to content/xul/templates/src/nsRDFQuery.cpp

rename from dom/xul/templates/nsRDFQuery.h
rename to content/xul/templates/src/nsRDFQuery.h

rename from dom/xul/templates/nsRDFTestNode.h
rename to content/xul/templates/src/nsRDFTestNode.h

rename from dom/xul/templates/nsResourceSet.cpp
rename to content/xul/templates/src/nsResourceSet.cpp

rename from dom/xul/templates/nsResourceSet.h
rename to content/xul/templates/src/nsResourceSet.h

rename from dom/xul/templates/nsRuleNetwork.cpp
rename to content/xul/templates/src/nsRuleNetwork.cpp

rename from dom/xul/templates/nsRuleNetwork.h
rename to content/xul/templates/src/nsRuleNetwork.h

rename from dom/xul/templates/nsTemplateMap.h
rename to content/xul/templates/src/nsTemplateMap.h

rename from dom/xul/templates/nsTemplateMatch.cpp
rename to content/xul/templates/src/nsTemplateMatch.cpp

rename from dom/xul/templates/nsTemplateMatch.h
rename to content/xul/templates/src/nsTemplateMatch.h

rename from dom/xul/templates/nsTemplateRule.cpp
rename to content/xul/templates/src/nsTemplateRule.cpp

rename from dom/xul/templates/nsTemplateRule.h
rename to content/xul/templates/src/nsTemplateRule.h

rename from dom/xul/templates/nsTreeRows.cpp
rename to content/xul/templates/src/nsTreeRows.cpp

rename from dom/xul/templates/nsTreeRows.h
rename to content/xul/templates/src/nsTreeRows.h

rename from dom/xul/templates/nsXMLBinding.cpp
rename to content/xul/templates/src/nsXMLBinding.cpp

rename from dom/xul/templates/nsXMLBinding.h
rename to content/xul/templates/src/nsXMLBinding.h

rename from dom/xul/templates/nsXULContentBuilder.cpp
rename to content/xul/templates/src/nsXULContentBuilder.cpp

rename from dom/xul/templates/nsXULContentUtils.cpp
rename to content/xul/templates/src/nsXULContentUtils.cpp

rename from dom/xul/templates/nsXULContentUtils.h
rename to content/xul/templates/src/nsXULContentUtils.h

rename from dom/xul/templates/nsXULResourceList.h
rename to content/xul/templates/src/nsXULResourceList.h

rename from dom/xul/templates/nsXULSortService.cpp
rename to content/xul/templates/src/nsXULSortService.cpp

rename from dom/xul/templates/nsXULSortService.h
rename to content/xul/templates/src/nsXULSortService.h

rename from dom/xul/templates/nsXULTemplateBuilder.cpp
rename to content/xul/templates/src/nsXULTemplateBuilder.cpp

rename from dom/xul/templates/nsXULTemplateBuilder.h
rename to content/xul/templates/src/nsXULTemplateBuilder.h

rename from dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
rename to content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp

rename from dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
rename to content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h

rename from dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
rename to content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp

rename from dom/xul/templates/nsXULTemplateQueryProcessorStorage.h
rename to content/xul/templates/src/nsXULTemplateQueryProcessorStorage.h

rename from dom/xul/templates/nsXULTemplateQueryProcessorXML.cpp
rename to content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp

rename from dom/xul/templates/nsXULTemplateQueryProcessorXML.h
rename to content/xul/templates/src/nsXULTemplateQueryProcessorXML.h

rename from dom/xul/templates/nsXULTemplateResultRDF.cpp
rename to content/xul/templates/src/nsXULTemplateResultRDF.cpp

rename from dom/xul/templates/nsXULTemplateResultRDF.h
rename to content/xul/templates/src/nsXULTemplateResultRDF.h

rename from dom/xul/templates/nsXULTemplateResultSetRDF.cpp
rename to content/xul/templates/src/nsXULTemplateResultSetRDF.cpp

rename from dom/xul/templates/nsXULTemplateResultSetRDF.h
rename to content/xul/templates/src/nsXULTemplateResultSetRDF.h

rename from dom/xul/templates/nsXULTemplateResultStorage.cpp
rename to content/xul/templates/src/nsXULTemplateResultStorage.cpp

rename from dom/xul/templates/nsXULTemplateResultStorage.h
rename to content/xul/templates/src/nsXULTemplateResultStorage.h

rename from dom/xul/templates/nsXULTemplateResultXML.cpp
rename to content/xul/templates/src/nsXULTemplateResultXML.cpp

rename from dom/xul/templates/nsXULTemplateResultXML.h
rename to content/xul/templates/src/nsXULTemplateResultXML.h

rename from dom/xul/templates/nsXULTreeBuilder.cpp
rename to content/xul/templates/src/nsXULTreeBuilder.cpp

rename from dom/xul/templates/tests/chrome/animals.rdf
rename to content/xul/templates/tests/chrome/animals.rdf

rename from dom/xul/templates/tests/chrome/animals.sqlite
rename to content/xul/templates/tests/chrome/animals.sqlite

rename from dom/xul/templates/tests/chrome/animals.xml
rename to content/xul/templates/tests/chrome/animals.xml

rename from dom/xul/templates/tests/chrome/bug441785-1.rdf
rename to content/xul/templates/tests/chrome/bug441785-1.rdf

rename from dom/xul/templates/tests/chrome/bug441785-2.rdf
rename to content/xul/templates/tests/chrome/bug441785-2.rdf

rename from dom/xul/templates/tests/chrome/chrome.ini
rename to content/xul/templates/tests/chrome/chrome.ini

rename from dom/xul/templates/tests/chrome/file_bug330010.rdf
rename to content/xul/templates/tests/chrome/file_bug330010.rdf

rename from dom/xul/templates/tests/chrome/templates_shared.js
rename to content/xul/templates/tests/chrome/templates_shared.js

rename from dom/xul/templates/tests/chrome/test_bug329335.xul
rename to content/xul/templates/tests/chrome/test_bug329335.xul

rename from dom/xul/templates/tests/chrome/test_bug330010.xul
rename to content/xul/templates/tests/chrome/test_bug330010.xul

rename from dom/xul/templates/tests/chrome/test_bug397148.xul
rename to content/xul/templates/tests/chrome/test_bug397148.xul

rename from dom/xul/templates/tests/chrome/test_bug441785.xul
rename to content/xul/templates/tests/chrome/test_bug441785.xul

rename from dom/xul/templates/tests/chrome/test_bug476634.xul
rename to content/xul/templates/tests/chrome/test_bug476634.xul

rename from dom/xul/templates/tests/chrome/test_sortservice.xul
rename to content/xul/templates/tests/chrome/test_sortservice.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
rename to content/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
rename to content/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
rename to content/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
rename to content/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
rename to content/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_errors.xul
rename to content/xul/templates/tests/chrome/test_tmpl_errors.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
rename to content/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_gridelement.xul
rename to content/xul/templates/tests/chrome/test_tmpl_gridelement.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
rename to content/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
rename to content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
rename to content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
rename to content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
rename to content/xul/templates/tests/chrome/test_tmpl_invalidqp.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
rename to content/xul/templates/tests/chrome/test_tmpl_listboxelement.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
rename to content/xul/templates/tests/chrome/test_tmpl_literalasmember.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
rename to content/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
rename to content/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_menuelement.xul
rename to content/xul/templates/tests/chrome/test_tmpl_menuelement.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
rename to content/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
rename to content/xul/templates/tests/chrome/test_tmpl_menulistelement.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
rename to content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
rename to content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
rename to content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_noaction.xul
rename to content/xul/templates/tests/chrome/test_tmpl_noaction.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
rename to content/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
rename to content/xul/templates/tests/chrome/test_tmpl_parentconditions.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
rename to content/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_query3triples.xul
rename to content/xul/templates/tests/chrome/test_tmpl_query3triples.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
rename to content/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
rename to content/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querysetone.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querysetone.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querysettwo.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
rename to content/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
rename to content/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
rename to content/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_regenerate.xul
rename to content/xul/templates/tests/chrome/test_tmpl_regenerate.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
rename to content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_rule.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_simple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
rename to content/xul/templates/tests/chrome/test_tmpl_storage_tree.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
rename to content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
rename to content/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherecontains.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereendswith.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequals.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequals.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wheregreater.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_whereless.xul
rename to content/xul/templates/tests/chrome/test_tmpl_whereless.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherenorel.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
rename to content/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
--- a/dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
@@ -10,20 +10,20 @@
         onload="test_template();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
--- a/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
@@ -10,29 +10,29 @@
         onload="test_template();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon">
+    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon">
       <button label="Chameleon"/>
       <label value="9"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae">
+    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae">
       <button label="Emu"/>
       <label value="3"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba">
+    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba">
       <button label="Barn Owl"/>
       <label value="8"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax">
+    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax">
       <button label="Raven"/>
       <label value="5"/>
     </hbox>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
--- a/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
@@ -10,20 +10,20 @@
         onload="test_template();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
--- a/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
@@ -10,20 +10,20 @@
         onload="test_template();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="(Dromaius-novaehollandiae) is a large bird"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="(Tyto-alba) Barn Owl"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="(Corvus-corax) Raven"/>
-    <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="(Dromaius-novaehollandiae) is a large bird"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="(Tyto-alba) Barn Owl"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="(Corvus-corax) Raven"/>
+    <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
--- a/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
@@ -12,23 +12,23 @@
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
     <groupbox anyid="true" container="true" empty="false">
       <caption label="Reptiles false"/>
-      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
+      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
     </groupbox>
     <groupbox anyid="true" container="true" empty="false">
       <caption label="Birds true"/>
-      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" value="Emu"/>
-      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" value="Barn Owl"/>
-      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" value="Raven"/>
+      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" value="Emu"/>
+      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" value="Barn Owl"/>
+      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" value="Raven"/>
     </groupbox>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
--- a/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
@@ -10,20 +10,20 @@
         onload="test_template();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();

rename from dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
rename to content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
--- a/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
@@ -10,20 +10,20 @@
         onload="test_template();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
-    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
+    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();

--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -153,17 +153,17 @@ LOCAL_INCLUDES += [
     '../network/src',
     '../src/geolocation',
     '../src/storage',
     '../time',
     '../workers',
     '../xbl',
     '/content/base/src',
     '/content/html/document/src',
-    '/dom/xul',
+    '/content/xul/document/src',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/widget/shared',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':

--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -41,31 +41,32 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
+    '/content/xul/content/src',
+    '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
     '/dom/canvas',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',
     '/dom/svg',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xml',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
-    '/dom/xul',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/style',
     '/layout/xul/tree',
     '/media/mtransport',
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/peerconnection',

--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -111,19 +111,19 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
+    '/content/xul/content/src',
     '/dom/base',
     '/dom/svg',
-    '/dom/xul',
     '/image/src',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -125,22 +125,22 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
+    '/content/xul/content/src',
     '/dom/base',
     '/dom/settings',
     '/dom/src/storage',
     '/dom/workers',
     '/dom/xml',
-    '/dom/xul',
     '/js/xpconnect/wrappers',
     '/layout/generic',
     '/layout/xul',
     '/layout/xul/tree/',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     LOCAL_INCLUDES += [

--- a/dom/moz.build
+++ b/dom/moz.build
@@ -83,17 +83,16 @@ DIRS += [
     'promise',
     'smil',
     'telephony',
     'inputmethod',
     'webidl',
     'xbl',
     'xml',
     'xslt',
-    'xul',
     'resourcestats',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['plugins/ipc/hangui']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     DIRS += [

--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -38,18 +38,19 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
+    '/content/xul/content/src',
+    '/content/xul/document/src',
     '/dom/base',
     '/dom/xml',
-    '/dom/xul',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']

--- a/dom/xml/moz.build
+++ b/dom/xml/moz.build
@@ -36,16 +36,16 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/caps',
     '/content/base/src',
     '/content/html/document/src',
+    '/content/xul/content/src',
     '/dom/base',
-    '/dom/xul',
     '/layout/style',
 ]
 
 RESOURCE_FILES.dtd += [
     'htmlmathml-f.ent',
 ]

--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -35,16 +35,19 @@ LOCAL_INCLUDES += [
     '../mathml',
     '../style',
     '../tables',
     '../xul',
     '/caps',
     '/content/base/src',
     '/content/html/content/src',
     '/content/html/document/src',
+    '/content/xul/content/src',
+    '/content/xul/document/src',
+    '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
     '/dom/canvas',
     '/dom/file',
     '/dom/filesystem',
     '/dom/media',
@@ -56,18 +59,16 @@ LOCAL_INCLUDES += [
     '/dom/src/storage',
     '/dom/svg',
     '/dom/telephony',
     '/dom/xbl',
     '/dom/xslt/base',
     '/dom/xslt/xml',
     '/dom/xslt/xpath',
     '/dom/xslt/xslt',
-    '/dom/xul',
-    '/dom/xul/templates',
     '/editor/composer',
     '/editor/libeditor/base',
     '/editor/libeditor/html',
     '/editor/libeditor/text',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
     '/js/xpconnect/loader',

--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -118,25 +118,25 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
+    '../../content/xul/content/src',
     '../../dom/base',
     '../../dom/plugins/base',
     '../base',
     '../forms',
     '../style',
     '../svg',
     '../tables',
     '../xul',
-    '/dom/xul',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
 
 RESOURCE_FILES.html = [
     'folder.png',
 ]

--- a/layout/reftests/xul-document-load/readme.txt
+++ b/layout/reftests/xul-document-load/readme.txt
@@ -1,9 +1,9 @@
-This directory contains various XUL document (mozilla/dom/xul) testcases for reftest.
+This directory contains various XUL document (mozilla/content/xul/document) testcases for reftest.
 
 test001: Checks that stylesheets referenced from an overlay via an
          xml-stylesheet PI are applied to the master document appropriately.
 
 test002: Same as #1, but there's additional overlay between the master doc and
          the overlay with the stylesheet.
 
 test003: Checks that dynamically removing the stylesheet PI from an inline

--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -146,22 +146,22 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
+    '../../content/xul/document/src',
     '../base',
     '../generic',
     '../xul',
     '/dom/base',
     '/dom/xbl',
-    '/dom/xul',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
 
 RESOURCE_FILES += [
     'contenteditable.css',
     'designmode.css',
     'ImageDocument.css',

--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -272,16 +272,17 @@
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
 @BINPATH@/components/xpcom_threads.xpt
 @BINPATH@/components/xpcom_xpti.xpt
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xul.xpt
+@BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 
 ; JavaScript components
 @BINPATH@/components/ChromeNotifications.js
 @BINPATH@/components/ChromeNotifications.manifest
 @BINPATH@/components/ConsoleAPI.manifest
 @BINPATH@/components/ConsoleAPIStorage.js

--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -4,16 +4,19 @@
 include ../../testing/crashtest/sanity/crashtests.list
 
 include ../../accessible/tests/crashtests/crashtests.list
 
 include ../../content/base/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/media/test/crashtests/crashtests.list
+include ../../content/xul/content/crashtests/crashtests.list
+include ../../content/xul/document/crashtests/crashtests.list
+include ../../content/xul/templates/src/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
 include ../../dom/base/crashtests/crashtests.list
 include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/canvas/crashtests/crashtests.list
 include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
@@ -21,18 +24,16 @@ include ../../dom/mathml/crashtests/cras
 include ../../dom/plugins/test/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 include ../../dom/src/jsurl/crashtests/crashtests.list
 include ../../dom/src/offline/crashtests/crashtests.list
 include ../../dom/svg/crashtests/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xml/crashtests/crashtests.list
 include ../../dom/xslt/crashtests/crashtests.list
-include ../../dom/xul/crashtests/crashtests.list
-include ../../dom/xul/templates/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
 skip-if(browserIsRemote||!webrtc) include ../../dom/media/tests/crashtests/crashtests.list
 
 include ../../editor/crashtests.list
 
 include ../../gfx/tests/crashtests/crashtests.list

author	Ed Morley <emorley@mozilla.com>
	Wed, 06 Aug 2014 17:06:27 +0100
changeset 198202	a7180856b416f85cdf10e026e02db9e93edb4a8d
parent 198201	8b65ed5b350703c6c79c289bdc947d70991ce894
child 198203	8d97586ffcfca80adc6c3bafbba8ecfe1bf78a5c
push id	27264
push user	nigelbabu@gmail.com
push date	Thu, 07 Aug 2014 03:31:37 +0000
treeherder	mozilla-central@afcb3af79d09 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	946065
milestone	34.0a1
backs out	69551e5b1a5df921e55d1347de5b688125757918
first release with	nightly linux32 afcb3af79d09 / 34.0a1 / 20140807030202 / files nightly linux64 afcb3af79d09 / 34.0a1 / 20140807030202 / files nightly mac afcb3af79d09 / 34.0a1 / 20140807030202 / files nightly win32 afcb3af79d09 / 34.0a1 / 20140807030202 / files nightly win64 afcb3af79d09 / 34.0a1 / 20140807030202 / files
last release without	nightly linux32 6cbdd4d523a7 / 34.0a1 / 20140806030201 / files nightly linux64 6cbdd4d523a7 / 34.0a1 / 20140806030201 / files nightly mac 6cbdd4d523a7 / 34.0a1 / 20140806030201 / files nightly win32 6cbdd4d523a7 / 34.0a1 / 20140806030201 / files nightly win64 6cbdd4d523a7 / 34.0a1 / 20140806030201 / files