Bug 946065 - Part 8: Move content/xul/ to dom/ and flatten subdirectories. r=janv
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Sat, 25 Oct 2014 20:21:03 +0300
changeset 236668 c053db10004fe2bd2e183a440dbadf84816ed48b
parent 236667 e2832e9468c7c52421bb638daa9fc8847b81807a
child 236669 d245e31f8edce3b118f5088e3e1ff08a275d7b57
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjanv
bugs946065
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 946065 - Part 8: Move content/xul/ to dom/ and flatten subdirectories. r=janv
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
content/base/src/moz.build
content/html/content/src/moz.build
content/moz.build
content/xul/content/crashtests/107518-1.xml
content/xul/content/crashtests/252448-1.xul
content/xul/content/crashtests/253479-1.xul
content/xul/content/crashtests/253479-2.xul
content/xul/content/crashtests/326644-1-inner.xul
content/xul/content/crashtests/326644-1.html
content/xul/content/crashtests/326644-2-inner.xul
content/xul/content/crashtests/326644-2.html
content/xul/content/crashtests/326864-1.xul
content/xul/content/crashtests/326875-1.xul
content/xul/content/crashtests/326881-1.xul
content/xul/content/crashtests/329982-1.xhtml
content/xul/content/crashtests/336096-1.xhtml
content/xul/content/crashtests/354611-1.html
content/xul/content/crashtests/360078-1.xhtml
content/xul/content/crashtests/360078-1xbl.xml
content/xul/content/crashtests/363791-1.xul
content/xul/content/crashtests/384740-1.xul
content/xul/content/crashtests/384877-1-inner.xul
content/xul/content/crashtests/384877-1.html
content/xul/content/crashtests/386947-1.xul
content/xul/content/crashtests/425821-1.xul
content/xul/content/crashtests/429085-1.xhtml
content/xul/content/crashtests/431906-1-inner.xul
content/xul/content/crashtests/431906-1.html
content/xul/content/crashtests/451311-1.xul
content/xul/content/crashtests/461917-1.xhtml
content/xul/content/crashtests/509719-1-overlay.xul
content/xul/content/crashtests/509719-1.xul
content/xul/content/crashtests/509719-2-overlay.xul
content/xul/content/crashtests/509719-2.xul
content/xul/content/crashtests/crashtests.list
content/xul/content/moz.build
content/xul/content/public/moz.build
content/xul/content/public/nsIXULContextMenuBuilder.idl
content/xul/content/src/moz.build
content/xul/content/src/nsXULContextMenuBuilder.cpp
content/xul/content/src/nsXULContextMenuBuilder.h
content/xul/content/src/nsXULElement.cpp
content/xul/content/src/nsXULElement.h
content/xul/content/src/nsXULPopupListener.cpp
content/xul/content/src/nsXULPopupListener.h
content/xul/content/test/398289-resource.xul
content/xul/content/test/chrome.ini
content/xul/content/test/file_bug236853.rdf
content/xul/content/test/mochitest.ini
content/xul/content/test/test_bug233643.xul
content/xul/content/test/test_bug236853.xul
content/xul/content/test/test_bug398289.html
content/xul/content/test/test_bug486990.xul
content/xul/content/test/test_bug749367.xul
content/xul/content/test/test_bug775972.xul
content/xul/content/test/test_import_xul_to_content.xul
content/xul/document/crashtests/326204-1.xul
content/xul/document/crashtests/344215-1.xul
content/xul/document/crashtests/386914-1-inner.xul
content/xul/document/crashtests/386914-1.html
content/xul/document/crashtests/428951-1.xul
content/xul/document/crashtests/468211-1.xul
content/xul/document/crashtests/468211-2-binding.xml
content/xul/document/crashtests/468211-2.xul
content/xul/document/crashtests/468211-3.xul
content/xul/document/crashtests/495635-1.xul
content/xul/document/crashtests/583230.xul
content/xul/document/crashtests/crashtests.list
content/xul/document/crashtests/extA1.xul
content/xul/document/crashtests/extA2.xul
content/xul/document/crashtests/extB1.xul
content/xul/document/moz.build
content/xul/document/public/moz.build
content/xul/document/public/nsIController.idl
content/xul/document/public/nsIControllers.idl
content/xul/document/public/nsIXULDocument.h
content/xul/document/public/nsIXULOverlayProvider.idl
content/xul/document/src/XULDocument.cpp
content/xul/document/src/XULDocument.h
content/xul/document/src/moz.build
content/xul/document/src/nsForwardReference.h
content/xul/document/src/nsXULCommandDispatcher.cpp
content/xul/document/src/nsXULCommandDispatcher.h
content/xul/document/src/nsXULContentSink.cpp
content/xul/document/src/nsXULContentSink.h
content/xul/document/src/nsXULControllers.cpp
content/xul/document/src/nsXULControllers.h
content/xul/document/src/nsXULPrototypeCache.cpp
content/xul/document/src/nsXULPrototypeCache.h
content/xul/document/src/nsXULPrototypeDocument.cpp
content/xul/document/src/nsXULPrototypeDocument.h
content/xul/document/test/bug497875-iframe.xul
content/xul/document/test/chrome.ini
content/xul/document/test/overlay1_bug335375.xul
content/xul/document/test/overlay2_bug335375.xul
content/xul/document/test/overlay_640158.xul
content/xul/document/test/test_bug199692.xul
content/xul/document/test/test_bug311681.xul
content/xul/document/test/test_bug335375.xul
content/xul/document/test/test_bug391002.xul
content/xul/document/test/test_bug403868.xul
content/xul/document/test/test_bug414907.xul
content/xul/document/test/test_bug418216.xul
content/xul/document/test/test_bug445177.xul
content/xul/document/test/test_bug449457.xul
content/xul/document/test/test_bug468176.xul
content/xul/document/test/test_bug497875.xul
content/xul/document/test/test_bug583948.xul
content/xul/document/test/test_bug640158_overlay_persist.xul
content/xul/document/test/test_bug757137.xul
content/xul/document/test/window_bug583948.xul
content/xul/document/test/window_bug757137.xul
content/xul/moz.build
content/xul/templates/moz.build
content/xul/templates/public/moz.build
content/xul/templates/public/nsIXULBuilderListener.idl
content/xul/templates/public/nsIXULSortService.idl
content/xul/templates/public/nsIXULTemplateBuilder.idl
content/xul/templates/public/nsIXULTemplateQueryProcessor.idl
content/xul/templates/public/nsIXULTemplateResult.idl
content/xul/templates/public/nsIXULTemplateRuleFilter.idl
content/xul/templates/src/crashtests/257752-1-recursion.rdf
content/xul/templates/src/crashtests/257752-1-recursion.xul
content/xul/templates/src/crashtests/329884-1.xul
content/xul/templates/src/crashtests/330012-1.rdf
content/xul/templates/src/crashtests/330012-1.xul
content/xul/templates/src/crashtests/404346-1.xul
content/xul/templates/src/crashtests/415019-1.xul
content/xul/templates/src/crashtests/417840-1.xul
content/xul/templates/src/crashtests/424418-1.xul
content/xul/templates/src/crashtests/crashtests.list
content/xul/templates/src/moz.build
content/xul/templates/src/nsContentSupportMap.cpp
content/xul/templates/src/nsContentSupportMap.h
content/xul/templates/src/nsContentTestNode.cpp
content/xul/templates/src/nsContentTestNode.h
content/xul/templates/src/nsInstantiationNode.cpp
content/xul/templates/src/nsInstantiationNode.h
content/xul/templates/src/nsRDFBinding.cpp
content/xul/templates/src/nsRDFBinding.h
content/xul/templates/src/nsRDFConInstanceTestNode.cpp
content/xul/templates/src/nsRDFConInstanceTestNode.h
content/xul/templates/src/nsRDFConMemberTestNode.cpp
content/xul/templates/src/nsRDFConMemberTestNode.h
content/xul/templates/src/nsRDFPropertyTestNode.cpp
content/xul/templates/src/nsRDFPropertyTestNode.h
content/xul/templates/src/nsRDFQuery.cpp
content/xul/templates/src/nsRDFQuery.h
content/xul/templates/src/nsRDFTestNode.h
content/xul/templates/src/nsResourceSet.cpp
content/xul/templates/src/nsResourceSet.h
content/xul/templates/src/nsRuleNetwork.cpp
content/xul/templates/src/nsRuleNetwork.h
content/xul/templates/src/nsTemplateMap.h
content/xul/templates/src/nsTemplateMatch.cpp
content/xul/templates/src/nsTemplateMatch.h
content/xul/templates/src/nsTemplateRule.cpp
content/xul/templates/src/nsTemplateRule.h
content/xul/templates/src/nsTreeRows.cpp
content/xul/templates/src/nsTreeRows.h
content/xul/templates/src/nsXMLBinding.cpp
content/xul/templates/src/nsXMLBinding.h
content/xul/templates/src/nsXULContentBuilder.cpp
content/xul/templates/src/nsXULContentUtils.cpp
content/xul/templates/src/nsXULContentUtils.h
content/xul/templates/src/nsXULResourceList.h
content/xul/templates/src/nsXULSortService.cpp
content/xul/templates/src/nsXULSortService.h
content/xul/templates/src/nsXULTemplateBuilder.cpp
content/xul/templates/src/nsXULTemplateBuilder.h
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h
content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp
content/xul/templates/src/nsXULTemplateQueryProcessorStorage.h
content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp
content/xul/templates/src/nsXULTemplateQueryProcessorXML.h
content/xul/templates/src/nsXULTemplateResultRDF.cpp
content/xul/templates/src/nsXULTemplateResultRDF.h
content/xul/templates/src/nsXULTemplateResultSetRDF.cpp
content/xul/templates/src/nsXULTemplateResultSetRDF.h
content/xul/templates/src/nsXULTemplateResultStorage.cpp
content/xul/templates/src/nsXULTemplateResultStorage.h
content/xul/templates/src/nsXULTemplateResultXML.cpp
content/xul/templates/src/nsXULTemplateResultXML.h
content/xul/templates/src/nsXULTreeBuilder.cpp
content/xul/templates/tests/chrome/animals.rdf
content/xul/templates/tests/chrome/animals.sqlite
content/xul/templates/tests/chrome/animals.xml
content/xul/templates/tests/chrome/bug441785-1.rdf
content/xul/templates/tests/chrome/bug441785-2.rdf
content/xul/templates/tests/chrome/chrome.ini
content/xul/templates/tests/chrome/file_bug330010.rdf
content/xul/templates/tests/chrome/templates_shared.js
content/xul/templates/tests/chrome/test_bug329335.xul
content/xul/templates/tests/chrome/test_bug330010.xul
content/xul/templates/tests/chrome/test_bug397148.xul
content/xul/templates/tests/chrome/test_bug441785.xul
content/xul/templates/tests/chrome/test_bug476634.xul
content/xul/templates/tests/chrome/test_sortservice.xul
content/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
content/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
content/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
content/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
content/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
content/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
content/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
content/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
content/xul/templates/tests/chrome/test_tmpl_errors.xul
content/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
content/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
content/xul/templates/tests/chrome/test_tmpl_gridelement.xul
content/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
content/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
content/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
content/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
content/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
content/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
content/xul/templates/tests/chrome/test_tmpl_menuelement.xul
content/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
content/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
content/xul/templates/tests/chrome/test_tmpl_noaction.xul
content/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
content/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
content/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
content/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
content/xul/templates/tests/chrome/test_tmpl_query3triples.xul
content/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
content/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
content/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
content/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
content/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
content/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
content/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
content/xul/templates/tests/chrome/test_tmpl_querysetone.xul
content/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
content/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
content/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
content/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
content/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
content/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
content/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
content/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
content/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
content/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
content/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
content/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
content/xul/templates/tests/chrome/test_tmpl_regenerate.xul
content/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
content/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
content/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
content/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
content/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
content/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
content/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
content/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
content/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
content/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
content/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
content/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
content/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
content/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
content/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
content/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
content/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
content/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
content/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
content/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
content/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
content/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
content/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
content/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
content/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
content/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
content/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
content/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
content/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
content/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
content/xul/templates/tests/chrome/test_tmpl_whereequals.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
content/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
content/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
content/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
content/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
content/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
content/xul/templates/tests/chrome/test_tmpl_whereless.xul
content/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
content/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
content/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
content/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
content/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
content/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
content/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
content/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
content/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
content/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
content/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
content/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
content/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
content/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
dom/base/moz.build
dom/bindings/moz.build
dom/canvas/moz.build
dom/events/moz.build
dom/moz.build
dom/xbl/moz.build
dom/xml/moz.build
dom/xul/XULDocument.cpp
dom/xul/XULDocument.h
dom/xul/crashtests/107518-1.xml
dom/xul/crashtests/252448-1.xul
dom/xul/crashtests/253479-1.xul
dom/xul/crashtests/253479-2.xul
dom/xul/crashtests/326204-1.xul
dom/xul/crashtests/326644-1-inner.xul
dom/xul/crashtests/326644-1.html
dom/xul/crashtests/326644-2-inner.xul
dom/xul/crashtests/326644-2.html
dom/xul/crashtests/326864-1.xul
dom/xul/crashtests/326875-1.xul
dom/xul/crashtests/326881-1.xul
dom/xul/crashtests/329982-1.xhtml
dom/xul/crashtests/336096-1.xhtml
dom/xul/crashtests/344215-1.xul
dom/xul/crashtests/354611-1.html
dom/xul/crashtests/360078-1.xhtml
dom/xul/crashtests/360078-1xbl.xml
dom/xul/crashtests/363791-1.xul
dom/xul/crashtests/384740-1.xul
dom/xul/crashtests/384877-1-inner.xul
dom/xul/crashtests/384877-1.html
dom/xul/crashtests/386914-1-inner.xul
dom/xul/crashtests/386914-1.html
dom/xul/crashtests/386947-1.xul
dom/xul/crashtests/425821-1.xul
dom/xul/crashtests/428951-1.xul
dom/xul/crashtests/429085-1.xhtml
dom/xul/crashtests/431906-1-inner.xul
dom/xul/crashtests/431906-1.html
dom/xul/crashtests/451311-1.xul
dom/xul/crashtests/461917-1.xhtml
dom/xul/crashtests/468211-1.xul
dom/xul/crashtests/468211-2-binding.xml
dom/xul/crashtests/468211-2.xul
dom/xul/crashtests/468211-3.xul
dom/xul/crashtests/495635-1.xul
dom/xul/crashtests/509719-1-overlay.xul
dom/xul/crashtests/509719-1.xul
dom/xul/crashtests/509719-2-overlay.xul
dom/xul/crashtests/509719-2.xul
dom/xul/crashtests/583230.xul
dom/xul/crashtests/crashtests.list
dom/xul/crashtests/extA1.xul
dom/xul/crashtests/extA2.xul
dom/xul/crashtests/extB1.xul
dom/xul/moz.build
dom/xul/nsForwardReference.h
dom/xul/nsIController.idl
dom/xul/nsIControllers.idl
dom/xul/nsIXULContextMenuBuilder.idl
dom/xul/nsIXULDocument.h
dom/xul/nsIXULOverlayProvider.idl
dom/xul/nsXULCommandDispatcher.cpp
dom/xul/nsXULCommandDispatcher.h
dom/xul/nsXULContentSink.cpp
dom/xul/nsXULContentSink.h
dom/xul/nsXULContextMenuBuilder.cpp
dom/xul/nsXULContextMenuBuilder.h
dom/xul/nsXULControllers.cpp
dom/xul/nsXULControllers.h
dom/xul/nsXULElement.cpp
dom/xul/nsXULElement.h
dom/xul/nsXULPopupListener.cpp
dom/xul/nsXULPopupListener.h
dom/xul/nsXULPrototypeCache.cpp
dom/xul/nsXULPrototypeCache.h
dom/xul/nsXULPrototypeDocument.cpp
dom/xul/nsXULPrototypeDocument.h
dom/xul/templates/crashtests/257752-1-recursion.rdf
dom/xul/templates/crashtests/257752-1-recursion.xul
dom/xul/templates/crashtests/329884-1.xul
dom/xul/templates/crashtests/330012-1.rdf
dom/xul/templates/crashtests/330012-1.xul
dom/xul/templates/crashtests/404346-1.xul
dom/xul/templates/crashtests/415019-1.xul
dom/xul/templates/crashtests/417840-1.xul
dom/xul/templates/crashtests/424418-1.xul
dom/xul/templates/crashtests/crashtests.list
dom/xul/templates/moz.build
dom/xul/templates/nsContentSupportMap.cpp
dom/xul/templates/nsContentSupportMap.h
dom/xul/templates/nsContentTestNode.cpp
dom/xul/templates/nsContentTestNode.h
dom/xul/templates/nsIXULBuilderListener.idl
dom/xul/templates/nsIXULSortService.idl
dom/xul/templates/nsIXULTemplateBuilder.idl
dom/xul/templates/nsIXULTemplateQueryProcessor.idl
dom/xul/templates/nsIXULTemplateResult.idl
dom/xul/templates/nsIXULTemplateRuleFilter.idl
dom/xul/templates/nsInstantiationNode.cpp
dom/xul/templates/nsInstantiationNode.h
dom/xul/templates/nsRDFBinding.cpp
dom/xul/templates/nsRDFBinding.h
dom/xul/templates/nsRDFConInstanceTestNode.cpp
dom/xul/templates/nsRDFConInstanceTestNode.h
dom/xul/templates/nsRDFConMemberTestNode.cpp
dom/xul/templates/nsRDFConMemberTestNode.h
dom/xul/templates/nsRDFPropertyTestNode.cpp
dom/xul/templates/nsRDFPropertyTestNode.h
dom/xul/templates/nsRDFQuery.cpp
dom/xul/templates/nsRDFQuery.h
dom/xul/templates/nsRDFTestNode.h
dom/xul/templates/nsResourceSet.cpp
dom/xul/templates/nsResourceSet.h
dom/xul/templates/nsRuleNetwork.cpp
dom/xul/templates/nsRuleNetwork.h
dom/xul/templates/nsTemplateMap.h
dom/xul/templates/nsTemplateMatch.cpp
dom/xul/templates/nsTemplateMatch.h
dom/xul/templates/nsTemplateRule.cpp
dom/xul/templates/nsTemplateRule.h
dom/xul/templates/nsTreeRows.cpp
dom/xul/templates/nsTreeRows.h
dom/xul/templates/nsXMLBinding.cpp
dom/xul/templates/nsXMLBinding.h
dom/xul/templates/nsXULContentBuilder.cpp
dom/xul/templates/nsXULContentUtils.cpp
dom/xul/templates/nsXULContentUtils.h
dom/xul/templates/nsXULResourceList.h
dom/xul/templates/nsXULSortService.cpp
dom/xul/templates/nsXULSortService.h
dom/xul/templates/nsXULTemplateBuilder.cpp
dom/xul/templates/nsXULTemplateBuilder.h
dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
dom/xul/templates/nsXULTemplateQueryProcessorStorage.h
dom/xul/templates/nsXULTemplateQueryProcessorXML.cpp
dom/xul/templates/nsXULTemplateQueryProcessorXML.h
dom/xul/templates/nsXULTemplateResultRDF.cpp
dom/xul/templates/nsXULTemplateResultRDF.h
dom/xul/templates/nsXULTemplateResultSetRDF.cpp
dom/xul/templates/nsXULTemplateResultSetRDF.h
dom/xul/templates/nsXULTemplateResultStorage.cpp
dom/xul/templates/nsXULTemplateResultStorage.h
dom/xul/templates/nsXULTemplateResultXML.cpp
dom/xul/templates/nsXULTemplateResultXML.h
dom/xul/templates/nsXULTreeBuilder.cpp
dom/xul/templates/tests/chrome/animals.rdf
dom/xul/templates/tests/chrome/animals.sqlite
dom/xul/templates/tests/chrome/animals.xml
dom/xul/templates/tests/chrome/bug441785-1.rdf
dom/xul/templates/tests/chrome/bug441785-2.rdf
dom/xul/templates/tests/chrome/chrome.ini
dom/xul/templates/tests/chrome/file_bug330010.rdf
dom/xul/templates/tests/chrome/templates_shared.js
dom/xul/templates/tests/chrome/test_bug329335.xul
dom/xul/templates/tests/chrome/test_bug330010.xul
dom/xul/templates/tests/chrome/test_bug397148.xul
dom/xul/templates/tests/chrome/test_bug441785.xul
dom/xul/templates/tests/chrome/test_bug476634.xul
dom/xul/templates/tests/chrome/test_sortservice.xul
dom/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
dom/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
dom/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
dom/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
dom/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
dom/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
dom/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
dom/xul/templates/tests/chrome/test_tmpl_errors.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
dom/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
dom/xul/templates/tests/chrome/test_tmpl_gridelement.xul
dom/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
dom/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
dom/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
dom/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
dom/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
dom/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
dom/xul/templates/tests/chrome/test_tmpl_menuelement.xul
dom/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
dom/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
dom/xul/templates/tests/chrome/test_tmpl_noaction.xul
dom/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
dom/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
dom/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
dom/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_query3triples.xul
dom/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
dom/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
dom/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
dom/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
dom/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
dom/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
dom/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
dom/xul/templates/tests/chrome/test_tmpl_querysetone.xul
dom/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
dom/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
dom/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
dom/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
dom/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
dom/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
dom/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
dom/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
dom/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
dom/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
dom/xul/templates/tests/chrome/test_tmpl_regenerate.xul
dom/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
dom/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
dom/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
dom/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
dom/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
dom/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
dom/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
dom/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
dom/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
dom/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
dom/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
dom/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
dom/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
dom/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
dom/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
dom/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
dom/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
dom/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequals.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
dom/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
dom/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
dom/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
dom/xul/templates/tests/chrome/test_tmpl_whereless.xul
dom/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
dom/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
dom/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
dom/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
dom/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
dom/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
dom/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
dom/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
dom/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
dom/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
dom/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
dom/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
dom/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
dom/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
dom/xul/test/398289-resource.xul
dom/xul/test/bug497875-iframe.xul
dom/xul/test/chrome.ini
dom/xul/test/file_bug236853.rdf
dom/xul/test/mochitest.ini
dom/xul/test/overlay1_bug335375.xul
dom/xul/test/overlay2_bug335375.xul
dom/xul/test/overlay_640158.xul
dom/xul/test/test_bug199692.xul
dom/xul/test/test_bug233643.xul
dom/xul/test/test_bug236853.xul
dom/xul/test/test_bug311681.xul
dom/xul/test/test_bug335375.xul
dom/xul/test/test_bug391002.xul
dom/xul/test/test_bug398289.html
dom/xul/test/test_bug403868.xul
dom/xul/test/test_bug414907.xul
dom/xul/test/test_bug418216.xul
dom/xul/test/test_bug445177.xul
dom/xul/test/test_bug449457.xul
dom/xul/test/test_bug468176.xul
dom/xul/test/test_bug486990.xul
dom/xul/test/test_bug497875.xul
dom/xul/test/test_bug583948.xul
dom/xul/test/test_bug640158_overlay_persist.xul
dom/xul/test/test_bug749367.xul
dom/xul/test/test_bug757137.xul
dom/xul/test/test_bug775972.xul
dom/xul/test/test_import_xul_to_content.xul
dom/xul/test/window_bug583948.xul
dom/xul/test/window_bug757137.xul
layout/build/moz.build
layout/generic/moz.build
layout/reftests/xul-document-load/readme.txt
layout/style/moz.build
mobile/android/installer/package-manifest.in
testing/crashtest/crashtests.list
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -332,17 +332,16 @@
 @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
@@ -353,17 +353,16 @@
 @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
@@ -206,25 +206,24 @@ 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/svg/content/src',
-    '/content/xul/content/src',
-    '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/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',
     '/editor/txmgr',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
     '/netwerk/base/src',
--- a/content/moz.build
+++ b/content/moz.build
@@ -4,12 +4,11 @@
 # 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',
     'svg',
-    'xul',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
deleted file mode 100644
--- a/content/xul/content/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- 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']
deleted file mode 100644
--- a/content/xul/content/public/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- 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'
-
deleted file mode 100644
--- a/content/xul/content/src/moz.build
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- 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'
deleted file mode 100644
--- a/content/xul/document/crashtests/crashtests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
--- a/content/xul/document/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- 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']
deleted file mode 100644
--- a/content/xul/document/public/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- 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'
-
deleted file mode 100644
--- a/content/xul/document/src/moz.build
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- 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'
deleted file mode 100644
--- a/content/xul/document/test/chrome.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[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]
deleted file mode 100644
--- a/content/xul/templates/public/moz.build
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- 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'
-
deleted file mode 100644
--- a/content/xul/templates/src/moz.build
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- 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'
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -151,20 +151,20 @@ LOCAL_INCLUDES += [
     '../events',
     '../media',
     '../network',
     '../time',
     '../workers',
     '../xbl',
     '/content/base/src',
     '/content/html/document/src',
-    '/content/xul/document/src',
     '/docshell/base',
     '/dom/geolocation',
     '/dom/storage',
+    '/dom/xul',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/widget',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -42,30 +42,29 @@ 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/svg/content/src',
-    '/content/xul/content/src',
-    '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
     '/dom/canvas',
     '/dom/geolocation',
     '/dom/indexedDB',
     '/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
@@ -122,18 +122,18 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/svg/content/src',
-    '/content/xul/content/src',
     '/dom/base',
+    '/dom/xul',
     '/gfx/gl',
     '/image/src',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -127,22 +127,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/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
@@ -92,16 +92,17 @@ DIRS += [
     'smil',
     'telephony',
     'voicemail',
     '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,19 +38,18 @@ 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',
 ]
rename from content/xul/document/src/XULDocument.cpp
rename to dom/xul/XULDocument.cpp
rename from content/xul/document/src/XULDocument.h
rename to dom/xul/XULDocument.h
rename from content/xul/content/crashtests/107518-1.xml
rename to dom/xul/crashtests/107518-1.xml
rename from content/xul/content/crashtests/252448-1.xul
rename to dom/xul/crashtests/252448-1.xul
rename from content/xul/content/crashtests/253479-1.xul
rename to dom/xul/crashtests/253479-1.xul
rename from content/xul/content/crashtests/253479-2.xul
rename to dom/xul/crashtests/253479-2.xul
rename from content/xul/document/crashtests/326204-1.xul
rename to dom/xul/crashtests/326204-1.xul
rename from content/xul/content/crashtests/326644-1-inner.xul
rename to dom/xul/crashtests/326644-1-inner.xul
rename from content/xul/content/crashtests/326644-1.html
rename to dom/xul/crashtests/326644-1.html
rename from content/xul/content/crashtests/326644-2-inner.xul
rename to dom/xul/crashtests/326644-2-inner.xul
rename from content/xul/content/crashtests/326644-2.html
rename to dom/xul/crashtests/326644-2.html
rename from content/xul/content/crashtests/326864-1.xul
rename to dom/xul/crashtests/326864-1.xul
rename from content/xul/content/crashtests/326875-1.xul
rename to dom/xul/crashtests/326875-1.xul
rename from content/xul/content/crashtests/326881-1.xul
rename to dom/xul/crashtests/326881-1.xul
rename from content/xul/content/crashtests/329982-1.xhtml
rename to dom/xul/crashtests/329982-1.xhtml
rename from content/xul/content/crashtests/336096-1.xhtml
rename to dom/xul/crashtests/336096-1.xhtml
rename from content/xul/document/crashtests/344215-1.xul
rename to dom/xul/crashtests/344215-1.xul
rename from content/xul/content/crashtests/354611-1.html
rename to dom/xul/crashtests/354611-1.html
rename from content/xul/content/crashtests/360078-1.xhtml
rename to dom/xul/crashtests/360078-1.xhtml
rename from content/xul/content/crashtests/360078-1xbl.xml
rename to dom/xul/crashtests/360078-1xbl.xml
rename from content/xul/content/crashtests/363791-1.xul
rename to dom/xul/crashtests/363791-1.xul
rename from content/xul/content/crashtests/384740-1.xul
rename to dom/xul/crashtests/384740-1.xul
rename from content/xul/content/crashtests/384877-1-inner.xul
rename to dom/xul/crashtests/384877-1-inner.xul
rename from content/xul/content/crashtests/384877-1.html
rename to dom/xul/crashtests/384877-1.html
rename from content/xul/document/crashtests/386914-1-inner.xul
rename to dom/xul/crashtests/386914-1-inner.xul
rename from content/xul/document/crashtests/386914-1.html
rename to dom/xul/crashtests/386914-1.html
rename from content/xul/content/crashtests/386947-1.xul
rename to dom/xul/crashtests/386947-1.xul
rename from content/xul/content/crashtests/425821-1.xul
rename to dom/xul/crashtests/425821-1.xul
rename from content/xul/document/crashtests/428951-1.xul
rename to dom/xul/crashtests/428951-1.xul
rename from content/xul/content/crashtests/429085-1.xhtml
rename to dom/xul/crashtests/429085-1.xhtml
rename from content/xul/content/crashtests/431906-1-inner.xul
rename to dom/xul/crashtests/431906-1-inner.xul
rename from content/xul/content/crashtests/431906-1.html
rename to dom/xul/crashtests/431906-1.html
rename from content/xul/content/crashtests/451311-1.xul
rename to dom/xul/crashtests/451311-1.xul
rename from content/xul/content/crashtests/461917-1.xhtml
rename to dom/xul/crashtests/461917-1.xhtml
rename from content/xul/document/crashtests/468211-1.xul
rename to dom/xul/crashtests/468211-1.xul
rename from content/xul/document/crashtests/468211-2-binding.xml
rename to dom/xul/crashtests/468211-2-binding.xml
rename from content/xul/document/crashtests/468211-2.xul
rename to dom/xul/crashtests/468211-2.xul
rename from content/xul/document/crashtests/468211-3.xul
rename to dom/xul/crashtests/468211-3.xul
rename from content/xul/document/crashtests/495635-1.xul
rename to dom/xul/crashtests/495635-1.xul
rename from content/xul/content/crashtests/509719-1-overlay.xul
rename to dom/xul/crashtests/509719-1-overlay.xul
rename from content/xul/content/crashtests/509719-1.xul
rename to dom/xul/crashtests/509719-1.xul
rename from content/xul/content/crashtests/509719-2-overlay.xul
rename to dom/xul/crashtests/509719-2-overlay.xul
rename from content/xul/content/crashtests/509719-2.xul
rename to dom/xul/crashtests/509719-2.xul
rename from content/xul/document/crashtests/583230.xul
rename to dom/xul/crashtests/583230.xul
rename from content/xul/content/crashtests/crashtests.list
rename to dom/xul/crashtests/crashtests.list
--- a/content/xul/content/crashtests/crashtests.list
+++ b/dom/xul/crashtests/crashtests.list
@@ -1,24 +1,33 @@
 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
rename from content/xul/document/crashtests/extA1.xul
rename to dom/xul/crashtests/extA1.xul
rename from content/xul/document/crashtests/extA2.xul
rename to dom/xul/crashtests/extA2.xul
rename from content/xul/document/crashtests/extB1.xul
rename to dom/xul/crashtests/extB1.xul
rename from content/xul/moz.build
rename to dom/xul/moz.build
--- a/content/xul/moz.build
+++ b/dom/xul/moz.build
@@ -1,14 +1,63 @@
 # -*- 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']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 if CONFIG['MOZ_XUL']:
     DIRS += ['templates']
 
+    XPIDL_SOURCES += [
+        'nsIXULContextMenuBuilder.idl',
+        'nsIXULOverlayProvider.idl',
+    ]
+
+    EXPORTS += [
+        'nsIXULDocument.h',
+    ]
+
+    UNIFIED_SOURCES += [
+        'nsXULCommandDispatcher.cpp',
+        'nsXULContentSink.cpp',
+        'nsXULContextMenuBuilder.cpp',
+        'nsXULElement.cpp',
+        'nsXULPopupListener.cpp',
+        'nsXULPrototypeCache.cpp',
+        'nsXULPrototypeDocument.cpp',
+        'XULDocument.cpp',
+    ]
+
+XPIDL_SOURCES += [
+    'nsIController.idl',
+    'nsIControllers.idl',
+]
+
+XPIDL_MODULE = 'xul'
+
+UNIFIED_SOURCES += [
+    'nsXULControllers.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'
rename from content/xul/document/src/nsForwardReference.h
rename to dom/xul/nsForwardReference.h
rename from content/xul/document/public/nsIController.idl
rename to dom/xul/nsIController.idl
rename from content/xul/document/public/nsIControllers.idl
rename to dom/xul/nsIControllers.idl
rename from content/xul/content/public/nsIXULContextMenuBuilder.idl
rename to dom/xul/nsIXULContextMenuBuilder.idl
rename from content/xul/document/public/nsIXULDocument.h
rename to dom/xul/nsIXULDocument.h
rename from content/xul/document/public/nsIXULOverlayProvider.idl
rename to dom/xul/nsIXULOverlayProvider.idl
rename from content/xul/document/src/nsXULCommandDispatcher.cpp
rename to dom/xul/nsXULCommandDispatcher.cpp
rename from content/xul/document/src/nsXULCommandDispatcher.h
rename to dom/xul/nsXULCommandDispatcher.h
rename from content/xul/document/src/nsXULContentSink.cpp
rename to dom/xul/nsXULContentSink.cpp
rename from content/xul/document/src/nsXULContentSink.h
rename to dom/xul/nsXULContentSink.h
rename from content/xul/content/src/nsXULContextMenuBuilder.cpp
rename to dom/xul/nsXULContextMenuBuilder.cpp
rename from content/xul/content/src/nsXULContextMenuBuilder.h
rename to dom/xul/nsXULContextMenuBuilder.h
rename from content/xul/document/src/nsXULControllers.cpp
rename to dom/xul/nsXULControllers.cpp
rename from content/xul/document/src/nsXULControllers.h
rename to dom/xul/nsXULControllers.h
rename from content/xul/content/src/nsXULElement.cpp
rename to dom/xul/nsXULElement.cpp
rename from content/xul/content/src/nsXULElement.h
rename to dom/xul/nsXULElement.h
rename from content/xul/content/src/nsXULPopupListener.cpp
rename to dom/xul/nsXULPopupListener.cpp
rename from content/xul/content/src/nsXULPopupListener.h
rename to dom/xul/nsXULPopupListener.h
rename from content/xul/document/src/nsXULPrototypeCache.cpp
rename to dom/xul/nsXULPrototypeCache.cpp
rename from content/xul/document/src/nsXULPrototypeCache.h
rename to dom/xul/nsXULPrototypeCache.h
rename from content/xul/document/src/nsXULPrototypeDocument.cpp
rename to dom/xul/nsXULPrototypeDocument.cpp
rename from content/xul/document/src/nsXULPrototypeDocument.h
rename to dom/xul/nsXULPrototypeDocument.h
rename from content/xul/templates/src/crashtests/257752-1-recursion.rdf
rename to dom/xul/templates/crashtests/257752-1-recursion.rdf
rename from content/xul/templates/src/crashtests/257752-1-recursion.xul
rename to dom/xul/templates/crashtests/257752-1-recursion.xul
rename from content/xul/templates/src/crashtests/329884-1.xul
rename to dom/xul/templates/crashtests/329884-1.xul
rename from content/xul/templates/src/crashtests/330012-1.rdf
rename to dom/xul/templates/crashtests/330012-1.rdf
rename from content/xul/templates/src/crashtests/330012-1.xul
rename to dom/xul/templates/crashtests/330012-1.xul
rename from content/xul/templates/src/crashtests/404346-1.xul
rename to dom/xul/templates/crashtests/404346-1.xul
rename from content/xul/templates/src/crashtests/415019-1.xul
rename to dom/xul/templates/crashtests/415019-1.xul
rename from content/xul/templates/src/crashtests/417840-1.xul
rename to dom/xul/templates/crashtests/417840-1.xul
rename from content/xul/templates/src/crashtests/424418-1.xul
rename to dom/xul/templates/crashtests/424418-1.xul
rename from content/xul/templates/src/crashtests/crashtests.list
rename to dom/xul/templates/crashtests/crashtests.list
rename from content/xul/templates/moz.build
rename to dom/xul/templates/moz.build
--- a/content/xul/templates/moz.build
+++ b/dom/xul/templates/moz.build
@@ -1,9 +1,58 @@
 # -*- 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 += ['tests/chrome/chrome.ini']
+
+XPIDL_SOURCES += [
+    'nsIXULBuilderListener.idl',
+    'nsIXULSortService.idl',
+    'nsIXULTemplateBuilder.idl',
+    'nsIXULTemplateQueryProcessor.idl',
+    'nsIXULTemplateResult.idl',
+    'nsIXULTemplateRuleFilter.idl',
+]
+
+XPIDL_MODULE = 'xultmpl'
 
-MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
+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'
rename from content/xul/templates/src/nsContentSupportMap.cpp
rename to dom/xul/templates/nsContentSupportMap.cpp
rename from content/xul/templates/src/nsContentSupportMap.h
rename to dom/xul/templates/nsContentSupportMap.h
rename from content/xul/templates/src/nsContentTestNode.cpp
rename to dom/xul/templates/nsContentTestNode.cpp
rename from content/xul/templates/src/nsContentTestNode.h
rename to dom/xul/templates/nsContentTestNode.h
rename from content/xul/templates/public/nsIXULBuilderListener.idl
rename to dom/xul/templates/nsIXULBuilderListener.idl
rename from content/xul/templates/public/nsIXULSortService.idl
rename to dom/xul/templates/nsIXULSortService.idl
rename from content/xul/templates/public/nsIXULTemplateBuilder.idl
rename to dom/xul/templates/nsIXULTemplateBuilder.idl
rename from content/xul/templates/public/nsIXULTemplateQueryProcessor.idl
rename to dom/xul/templates/nsIXULTemplateQueryProcessor.idl
rename from content/xul/templates/public/nsIXULTemplateResult.idl
rename to dom/xul/templates/nsIXULTemplateResult.idl
rename from content/xul/templates/public/nsIXULTemplateRuleFilter.idl
rename to dom/xul/templates/nsIXULTemplateRuleFilter.idl
rename from content/xul/templates/src/nsInstantiationNode.cpp
rename to dom/xul/templates/nsInstantiationNode.cpp
rename from content/xul/templates/src/nsInstantiationNode.h
rename to dom/xul/templates/nsInstantiationNode.h
rename from content/xul/templates/src/nsRDFBinding.cpp
rename to dom/xul/templates/nsRDFBinding.cpp
rename from content/xul/templates/src/nsRDFBinding.h
rename to dom/xul/templates/nsRDFBinding.h
rename from content/xul/templates/src/nsRDFConInstanceTestNode.cpp
rename to dom/xul/templates/nsRDFConInstanceTestNode.cpp
rename from content/xul/templates/src/nsRDFConInstanceTestNode.h
rename to dom/xul/templates/nsRDFConInstanceTestNode.h
rename from content/xul/templates/src/nsRDFConMemberTestNode.cpp
rename to dom/xul/templates/nsRDFConMemberTestNode.cpp
rename from content/xul/templates/src/nsRDFConMemberTestNode.h
rename to dom/xul/templates/nsRDFConMemberTestNode.h
rename from content/xul/templates/src/nsRDFPropertyTestNode.cpp
rename to dom/xul/templates/nsRDFPropertyTestNode.cpp
rename from content/xul/templates/src/nsRDFPropertyTestNode.h
rename to dom/xul/templates/nsRDFPropertyTestNode.h
rename from content/xul/templates/src/nsRDFQuery.cpp
rename to dom/xul/templates/nsRDFQuery.cpp
rename from content/xul/templates/src/nsRDFQuery.h
rename to dom/xul/templates/nsRDFQuery.h
rename from content/xul/templates/src/nsRDFTestNode.h
rename to dom/xul/templates/nsRDFTestNode.h
rename from content/xul/templates/src/nsResourceSet.cpp
rename to dom/xul/templates/nsResourceSet.cpp
rename from content/xul/templates/src/nsResourceSet.h
rename to dom/xul/templates/nsResourceSet.h
rename from content/xul/templates/src/nsRuleNetwork.cpp
rename to dom/xul/templates/nsRuleNetwork.cpp
rename from content/xul/templates/src/nsRuleNetwork.h
rename to dom/xul/templates/nsRuleNetwork.h
rename from content/xul/templates/src/nsTemplateMap.h
rename to dom/xul/templates/nsTemplateMap.h
rename from content/xul/templates/src/nsTemplateMatch.cpp
rename to dom/xul/templates/nsTemplateMatch.cpp
rename from content/xul/templates/src/nsTemplateMatch.h
rename to dom/xul/templates/nsTemplateMatch.h
rename from content/xul/templates/src/nsTemplateRule.cpp
rename to dom/xul/templates/nsTemplateRule.cpp
rename from content/xul/templates/src/nsTemplateRule.h
rename to dom/xul/templates/nsTemplateRule.h
rename from content/xul/templates/src/nsTreeRows.cpp
rename to dom/xul/templates/nsTreeRows.cpp
rename from content/xul/templates/src/nsTreeRows.h
rename to dom/xul/templates/nsTreeRows.h
rename from content/xul/templates/src/nsXMLBinding.cpp
rename to dom/xul/templates/nsXMLBinding.cpp
rename from content/xul/templates/src/nsXMLBinding.h
rename to dom/xul/templates/nsXMLBinding.h
rename from content/xul/templates/src/nsXULContentBuilder.cpp
rename to dom/xul/templates/nsXULContentBuilder.cpp
rename from content/xul/templates/src/nsXULContentUtils.cpp
rename to dom/xul/templates/nsXULContentUtils.cpp
rename from content/xul/templates/src/nsXULContentUtils.h
rename to dom/xul/templates/nsXULContentUtils.h
rename from content/xul/templates/src/nsXULResourceList.h
rename to dom/xul/templates/nsXULResourceList.h
rename from content/xul/templates/src/nsXULSortService.cpp
rename to dom/xul/templates/nsXULSortService.cpp
rename from content/xul/templates/src/nsXULSortService.h
rename to dom/xul/templates/nsXULSortService.h
rename from content/xul/templates/src/nsXULTemplateBuilder.cpp
rename to dom/xul/templates/nsXULTemplateBuilder.cpp
rename from content/xul/templates/src/nsXULTemplateBuilder.h
rename to dom/xul/templates/nsXULTemplateBuilder.h
rename from content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
rename to dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
rename from content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h
rename to dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
rename from content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp
rename to dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
rename from content/xul/templates/src/nsXULTemplateQueryProcessorStorage.h
rename to dom/xul/templates/nsXULTemplateQueryProcessorStorage.h
rename from content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp
rename to dom/xul/templates/nsXULTemplateQueryProcessorXML.cpp
rename from content/xul/templates/src/nsXULTemplateQueryProcessorXML.h
rename to dom/xul/templates/nsXULTemplateQueryProcessorXML.h
rename from content/xul/templates/src/nsXULTemplateResultRDF.cpp
rename to dom/xul/templates/nsXULTemplateResultRDF.cpp
rename from content/xul/templates/src/nsXULTemplateResultRDF.h
rename to dom/xul/templates/nsXULTemplateResultRDF.h
rename from content/xul/templates/src/nsXULTemplateResultSetRDF.cpp
rename to dom/xul/templates/nsXULTemplateResultSetRDF.cpp
rename from content/xul/templates/src/nsXULTemplateResultSetRDF.h
rename to dom/xul/templates/nsXULTemplateResultSetRDF.h
rename from content/xul/templates/src/nsXULTemplateResultStorage.cpp
rename to dom/xul/templates/nsXULTemplateResultStorage.cpp
rename from content/xul/templates/src/nsXULTemplateResultStorage.h
rename to dom/xul/templates/nsXULTemplateResultStorage.h
rename from content/xul/templates/src/nsXULTemplateResultXML.cpp
rename to dom/xul/templates/nsXULTemplateResultXML.cpp
rename from content/xul/templates/src/nsXULTemplateResultXML.h
rename to dom/xul/templates/nsXULTemplateResultXML.h
rename from content/xul/templates/src/nsXULTreeBuilder.cpp
rename to dom/xul/templates/nsXULTreeBuilder.cpp
rename from content/xul/templates/tests/chrome/animals.rdf
rename to dom/xul/templates/tests/chrome/animals.rdf
rename from content/xul/templates/tests/chrome/animals.sqlite
rename to dom/xul/templates/tests/chrome/animals.sqlite
rename from content/xul/templates/tests/chrome/animals.xml
rename to dom/xul/templates/tests/chrome/animals.xml
rename from content/xul/templates/tests/chrome/bug441785-1.rdf
rename to dom/xul/templates/tests/chrome/bug441785-1.rdf
rename from content/xul/templates/tests/chrome/bug441785-2.rdf
rename to dom/xul/templates/tests/chrome/bug441785-2.rdf
rename from content/xul/templates/tests/chrome/chrome.ini
rename to dom/xul/templates/tests/chrome/chrome.ini
rename from content/xul/templates/tests/chrome/file_bug330010.rdf
rename to dom/xul/templates/tests/chrome/file_bug330010.rdf
rename from content/xul/templates/tests/chrome/templates_shared.js
rename to dom/xul/templates/tests/chrome/templates_shared.js
rename from content/xul/templates/tests/chrome/test_bug329335.xul
rename to dom/xul/templates/tests/chrome/test_bug329335.xul
rename from content/xul/templates/tests/chrome/test_bug330010.xul
rename to dom/xul/templates/tests/chrome/test_bug330010.xul
rename from content/xul/templates/tests/chrome/test_bug397148.xul
rename to dom/xul/templates/tests/chrome/test_bug397148.xul
rename from content/xul/templates/tests/chrome/test_bug441785.xul
rename to dom/xul/templates/tests/chrome/test_bug441785.xul
rename from content/xul/templates/tests/chrome/test_bug476634.xul
rename to dom/xul/templates/tests/chrome/test_bug476634.xul
rename from content/xul/templates/tests/chrome/test_sortservice.xul
rename to dom/xul/templates/tests/chrome/test_sortservice.xul
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
rename from content/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
rename from content/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
rename from content/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
rename from content/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
rename from content/xul/templates/tests/chrome/test_tmpl_errors.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_errors.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
rename from content/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
rename from content/xul/templates/tests/chrome/test_tmpl_gridelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_gridelement.xul
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
rename from content/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
rename from content/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
rename from content/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
rename from content/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
rename from content/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
rename from content/xul/templates/tests/chrome/test_tmpl_menuelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_menuelement.xul
rename from content/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
rename from content/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
rename from content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
rename from content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
rename from content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
rename from content/xul/templates/tests/chrome/test_tmpl_noaction.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_noaction.xul
rename from content/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
rename from content/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
rename from content/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
rename from content/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_query3triples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_query3triples.xul
rename from content/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
rename from content/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querysetone.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysetone.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
rename from content/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
rename from content/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
rename from content/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
rename from content/xul/templates/tests/chrome/test_tmpl_regenerate.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_regenerate.xul
rename from content/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
rename from content/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
rename from content/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequals.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequals.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
rename from content/xul/templates/tests/chrome/test_tmpl_whereless.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereless.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
+++ b/dom/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/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"/>
+    <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"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
+++ b/dom/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/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon">
       <button label="Chameleon"/>
       <label value="9"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae">
       <button label="Emu"/>
       <label value="3"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba">
       <button label="Barn Owl"/>
       <label value="8"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax">
       <button label="Raven"/>
       <label value="5"/>
     </hbox>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
+++ b/dom/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/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"/>
+    <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"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
+++ b/dom/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/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"/>
+    <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"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
+++ b/dom/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/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
+      <label id="chrome://mochitests/content/chrome/dom/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/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"/>
+      <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"/>
     </groupbox>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
+++ b/dom/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/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"/>
+    <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"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
+++ b/dom/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/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"/>
+    <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"/>
   </data>
 
 <script src="templates_shared.js"/>
 
 <script>
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
rename from content/xul/content/test/398289-resource.xul
rename to dom/xul/test/398289-resource.xul
rename from content/xul/document/test/bug497875-iframe.xul
rename to dom/xul/test/bug497875-iframe.xul
rename from content/xul/content/test/chrome.ini
rename to dom/xul/test/chrome.ini
--- a/content/xul/content/test/chrome.ini
+++ b/dom/xul/test/chrome.ini
@@ -1,10 +1,29 @@
 [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 content/xul/content/test/file_bug236853.rdf
rename to dom/xul/test/file_bug236853.rdf
rename from content/xul/content/test/mochitest.ini
rename to dom/xul/test/mochitest.ini
rename from content/xul/document/test/overlay1_bug335375.xul
rename to dom/xul/test/overlay1_bug335375.xul
rename from content/xul/document/test/overlay2_bug335375.xul
rename to dom/xul/test/overlay2_bug335375.xul
rename from content/xul/document/test/overlay_640158.xul
rename to dom/xul/test/overlay_640158.xul
rename from content/xul/document/test/test_bug199692.xul
rename to dom/xul/test/test_bug199692.xul
rename from content/xul/content/test/test_bug233643.xul
rename to dom/xul/test/test_bug233643.xul
rename from content/xul/content/test/test_bug236853.xul
rename to dom/xul/test/test_bug236853.xul
rename from content/xul/document/test/test_bug311681.xul
rename to dom/xul/test/test_bug311681.xul
rename from content/xul/document/test/test_bug335375.xul
rename to dom/xul/test/test_bug335375.xul
rename from content/xul/document/test/test_bug391002.xul
rename to dom/xul/test/test_bug391002.xul
rename from content/xul/content/test/test_bug398289.html
rename to dom/xul/test/test_bug398289.html
rename from content/xul/document/test/test_bug403868.xul
rename to dom/xul/test/test_bug403868.xul
rename from content/xul/document/test/test_bug414907.xul
rename to dom/xul/test/test_bug414907.xul
rename from content/xul/document/test/test_bug418216.xul
rename to dom/xul/test/test_bug418216.xul
rename from content/xul/document/test/test_bug445177.xul
rename to dom/xul/test/test_bug445177.xul
rename from content/xul/document/test/test_bug449457.xul
rename to dom/xul/test/test_bug449457.xul
rename from content/xul/document/test/test_bug468176.xul
rename to dom/xul/test/test_bug468176.xul
rename from content/xul/content/test/test_bug486990.xul
rename to dom/xul/test/test_bug486990.xul
rename from content/xul/document/test/test_bug497875.xul
rename to dom/xul/test/test_bug497875.xul
rename from content/xul/document/test/test_bug583948.xul
rename to dom/xul/test/test_bug583948.xul
rename from content/xul/document/test/test_bug640158_overlay_persist.xul
rename to dom/xul/test/test_bug640158_overlay_persist.xul
rename from content/xul/content/test/test_bug749367.xul
rename to dom/xul/test/test_bug749367.xul
rename from content/xul/document/test/test_bug757137.xul
rename to dom/xul/test/test_bug757137.xul
rename from content/xul/content/test/test_bug775972.xul
rename to dom/xul/test/test_bug775972.xul
rename from content/xul/content/test/test_import_xul_to_content.xul
rename to dom/xul/test/test_import_xul_to_content.xul
rename from content/xul/document/test/window_bug583948.xul
rename to dom/xul/test/window_bug583948.xul
rename from content/xul/document/test/window_bug757137.xul
rename to dom/xul/test/window_bug757137.xul
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -36,19 +36,16 @@ LOCAL_INCLUDES += [
     '../style',
     '../tables',
     '../xul',
     '/caps',
     '/content/base/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xul/content/src',
-    '/content/xul/document/src',
-    '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
     '/dom/canvas',
     '/dom/filesystem',
     '/dom/geolocation',
     '/dom/json',
@@ -58,16 +55,18 @@ LOCAL_INCLUDES += [
     '/dom/speakermanager',
     '/dom/storage',
     '/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',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
     '/netwerk/base/src',
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -117,25 +117,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/content/xul/document) testcases for reftest.
+This directory contains various XUL document (mozilla/dom/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
@@ -152,22 +152,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
@@ -276,17 +276,16 @@
 @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
@@ -5,19 +5,16 @@ include ../../testing/crashtest/sanity/c
 
 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/svg/content/src/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
@@ -25,16 +22,18 @@ include ../../dom/jsurl/crashtests/crash
 include ../../dom/mathml/crashtests/crashtests.list
 include ../../dom/offline/crashtests/crashtests.list
 include ../../dom/plugins/test/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 include ../../dom/workers/test/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