Bug 946065. Part 4: Move content/xbl to dom/ and flatten away 'src' directory. r=Ms2ger
authorRobert O'Callahan <robert@ocallahan.org>
Fri, 10 Jan 2014 16:03:25 +1300
changeset 173293 243259fda9aba5900ae1492c991a0e7a541a584d
parent 173292 90490e4035df6e9bb5b87fe0419aa3986becea69
child 173294 ec2fe87335a96d9ef4698805088dff62b492bd8a
push idunknown
push userunknown
push dateunknown
reviewersMs2ger
bugs946065
milestone29.0a1
Bug 946065. Part 4: Move content/xbl to dom/ and flatten away 'src' directory. r=Ms2ger
accessible/src/base/moz.build
content/base/src/moz.build
content/html/content/src/moz.build
content/moz.build
content/svg/content/src/moz.build
content/xbl/builtin/android/jar.mn
content/xbl/builtin/android/moz.build
content/xbl/builtin/android/platformHTMLBindings.xml
content/xbl/builtin/browser-base.inc
content/xbl/builtin/editor-base.inc
content/xbl/builtin/emacs/jar.mn
content/xbl/builtin/emacs/moz.build
content/xbl/builtin/emacs/platformHTMLBindings.xml
content/xbl/builtin/input-fields-base.inc
content/xbl/builtin/mac/jar.mn
content/xbl/builtin/mac/moz.build
content/xbl/builtin/mac/platformHTMLBindings.xml
content/xbl/builtin/moz.build
content/xbl/builtin/textareas-base.inc
content/xbl/builtin/unix/jar.mn
content/xbl/builtin/unix/moz.build
content/xbl/builtin/unix/platformHTMLBindings.xml
content/xbl/builtin/win/jar.mn
content/xbl/builtin/win/moz.build
content/xbl/builtin/win/platformHTMLBindings.xml
content/xbl/crashtests/205735-1.xhtml
content/xbl/crashtests/223799-1.xul
content/xbl/crashtests/226744-1.xhtml
content/xbl/crashtests/232095-1.xul
content/xbl/crashtests/277523-1.xhtml
content/xbl/crashtests/277950-1.xhtml
content/xbl/crashtests/336744-1-inner.html
content/xbl/crashtests/336744-1.html
content/xbl/crashtests/336960-1-inner.xhtml
content/xbl/crashtests/336960-1.html
content/xbl/crashtests/342954-1.xhtml
content/xbl/crashtests/342954-2-xbl.xml
content/xbl/crashtests/342954-2.xhtml
content/xbl/crashtests/368276-1.xhtml
content/xbl/crashtests/368641-1.xhtml
content/xbl/crashtests/378521-1.xhtml
content/xbl/crashtests/382376-1.xhtml
content/xbl/crashtests/382376-2.xhtml
content/xbl/crashtests/397596-1.xhtml
content/xbl/crashtests/404125-1.xhtml
content/xbl/crashtests/406900-1.xul
content/xbl/crashtests/406904-1.xhtml
content/xbl/crashtests/406904-2.xhtml
content/xbl/crashtests/415192-1.xul
content/xbl/crashtests/415301-1.xul
content/xbl/crashtests/418133-1.xhtml
content/xbl/crashtests/420233-1.xhtml
content/xbl/crashtests/421997-1.xhtml
content/xbl/crashtests/432813-1-xbl.xml
content/xbl/crashtests/432813-1.xhtml
content/xbl/crashtests/454820-1.html
content/xbl/crashtests/460665-1.xhtml
content/xbl/crashtests/463511-1.xhtml
content/xbl/crashtests/464863-1.xhtml
content/xbl/crashtests/472260-1.xhtml
content/xbl/crashtests/477878-1.html
content/xbl/crashtests/492978-1.xul
content/xbl/crashtests/493123-1.xhtml
content/xbl/crashtests/495354-1.xhtml
content/xbl/crashtests/507628-1.xhtml
content/xbl/crashtests/507991-1.xhtml
content/xbl/crashtests/830614-1.xul
content/xbl/crashtests/895805-1.xhtml
content/xbl/crashtests/crashtests.list
content/xbl/crashtests/set-field-bad-this.xhtml
content/xbl/moz.build
content/xbl/src/XBLChildrenElement.cpp
content/xbl/src/XBLChildrenElement.h
content/xbl/src/moz.build
content/xbl/src/nsBindingManager.cpp
content/xbl/src/nsBindingManager.h
content/xbl/src/nsXBLBinding.cpp
content/xbl/src/nsXBLBinding.h
content/xbl/src/nsXBLContentSink.cpp
content/xbl/src/nsXBLContentSink.h
content/xbl/src/nsXBLDocumentInfo.cpp
content/xbl/src/nsXBLDocumentInfo.h
content/xbl/src/nsXBLEventHandler.cpp
content/xbl/src/nsXBLEventHandler.h
content/xbl/src/nsXBLMaybeCompiled.h
content/xbl/src/nsXBLProtoImpl.cpp
content/xbl/src/nsXBLProtoImpl.h
content/xbl/src/nsXBLProtoImplField.cpp
content/xbl/src/nsXBLProtoImplField.h
content/xbl/src/nsXBLProtoImplMember.h
content/xbl/src/nsXBLProtoImplMethod.cpp
content/xbl/src/nsXBLProtoImplMethod.h
content/xbl/src/nsXBLProtoImplProperty.cpp
content/xbl/src/nsXBLProtoImplProperty.h
content/xbl/src/nsXBLPrototypeBinding.cpp
content/xbl/src/nsXBLPrototypeBinding.h
content/xbl/src/nsXBLPrototypeHandler.cpp
content/xbl/src/nsXBLPrototypeHandler.h
content/xbl/src/nsXBLPrototypeResources.cpp
content/xbl/src/nsXBLPrototypeResources.h
content/xbl/src/nsXBLResourceLoader.cpp
content/xbl/src/nsXBLResourceLoader.h
content/xbl/src/nsXBLSerialize.cpp
content/xbl/src/nsXBLSerialize.h
content/xbl/src/nsXBLService.cpp
content/xbl/src/nsXBLService.h
content/xbl/src/nsXBLWindowKeyHandler.cpp
content/xbl/src/nsXBLWindowKeyHandler.h
content/xbl/test/bug310107-resource.xhtml
content/xbl/test/chrome.ini
content/xbl/test/file_bug372769.xhtml
content/xbl/test/file_bug379959_cross.html
content/xbl/test/file_bug379959_data.html
content/xbl/test/file_bug379959_xbl.xml
content/xbl/test/file_bug397934.xhtml
content/xbl/test/file_bug481558.xbl
content/xbl/test/file_bug481558css.sjs
content/xbl/test/file_bug591198_inner.html
content/xbl/test/file_bug591198_xbl.xml
content/xbl/test/file_bug821850.xhtml
content/xbl/test/file_bug844783.xhtml
content/xbl/test/file_bug944407.html
content/xbl/test/file_bug944407.xml
content/xbl/test/file_bug950909.html
content/xbl/test/file_bug950909.xml
content/xbl/test/mochitest.ini
content/xbl/test/moz.build
content/xbl/test/test_bug310107.html
content/xbl/test/test_bug366770.html
content/xbl/test/test_bug371724.xhtml
content/xbl/test/test_bug372769.html
content/xbl/test/test_bug378518.xul
content/xbl/test/test_bug378866.xhtml
content/xbl/test/test_bug379959.html
content/xbl/test/test_bug389322.xhtml
content/xbl/test/test_bug397934.html
content/xbl/test/test_bug398135.xul
content/xbl/test/test_bug398492.xul
content/xbl/test/test_bug400705.xhtml
content/xbl/test/test_bug401907.xhtml
content/xbl/test/test_bug403162.xhtml
content/xbl/test/test_bug468210.xhtml
content/xbl/test/test_bug481558.html
content/xbl/test/test_bug526178.xhtml
content/xbl/test/test_bug542406.xhtml
content/xbl/test/test_bug591198.html
content/xbl/test/test_bug639338.xhtml
content/xbl/test/test_bug721452.xul
content/xbl/test/test_bug723676.xul
content/xbl/test/test_bug772966.xul
content/xbl/test/test_bug790265.xhtml
content/xbl/test/test_bug821850.html
content/xbl/test/test_bug844783.html
content/xbl/test/test_bug944407.xul
content/xbl/test/test_bug950909.xul
content/xul/content/src/moz.build
content/xul/document/src/moz.build
dom/base/moz.build
dom/bindings/moz.build
dom/moz.build
dom/xbl/XBLChildrenElement.cpp
dom/xbl/XBLChildrenElement.h
dom/xbl/builtin/android/jar.mn
dom/xbl/builtin/android/moz.build
dom/xbl/builtin/android/platformHTMLBindings.xml
dom/xbl/builtin/browser-base.inc
dom/xbl/builtin/editor-base.inc
dom/xbl/builtin/emacs/jar.mn
dom/xbl/builtin/emacs/moz.build
dom/xbl/builtin/emacs/platformHTMLBindings.xml
dom/xbl/builtin/input-fields-base.inc
dom/xbl/builtin/mac/jar.mn
dom/xbl/builtin/mac/moz.build
dom/xbl/builtin/mac/platformHTMLBindings.xml
dom/xbl/builtin/moz.build
dom/xbl/builtin/textareas-base.inc
dom/xbl/builtin/unix/jar.mn
dom/xbl/builtin/unix/moz.build
dom/xbl/builtin/unix/platformHTMLBindings.xml
dom/xbl/builtin/win/jar.mn
dom/xbl/builtin/win/moz.build
dom/xbl/builtin/win/platformHTMLBindings.xml
dom/xbl/crashtests/205735-1.xhtml
dom/xbl/crashtests/223799-1.xul
dom/xbl/crashtests/226744-1.xhtml
dom/xbl/crashtests/232095-1.xul
dom/xbl/crashtests/277523-1.xhtml
dom/xbl/crashtests/277950-1.xhtml
dom/xbl/crashtests/336744-1-inner.html
dom/xbl/crashtests/336744-1.html
dom/xbl/crashtests/336960-1-inner.xhtml
dom/xbl/crashtests/336960-1.html
dom/xbl/crashtests/342954-1.xhtml
dom/xbl/crashtests/342954-2-xbl.xml
dom/xbl/crashtests/342954-2.xhtml
dom/xbl/crashtests/368276-1.xhtml
dom/xbl/crashtests/368641-1.xhtml
dom/xbl/crashtests/378521-1.xhtml
dom/xbl/crashtests/382376-1.xhtml
dom/xbl/crashtests/382376-2.xhtml
dom/xbl/crashtests/397596-1.xhtml
dom/xbl/crashtests/404125-1.xhtml
dom/xbl/crashtests/406900-1.xul
dom/xbl/crashtests/406904-1.xhtml
dom/xbl/crashtests/406904-2.xhtml
dom/xbl/crashtests/415192-1.xul
dom/xbl/crashtests/415301-1.xul
dom/xbl/crashtests/418133-1.xhtml
dom/xbl/crashtests/420233-1.xhtml
dom/xbl/crashtests/421997-1.xhtml
dom/xbl/crashtests/432813-1-xbl.xml
dom/xbl/crashtests/432813-1.xhtml
dom/xbl/crashtests/454820-1.html
dom/xbl/crashtests/460665-1.xhtml
dom/xbl/crashtests/463511-1.xhtml
dom/xbl/crashtests/464863-1.xhtml
dom/xbl/crashtests/472260-1.xhtml
dom/xbl/crashtests/477878-1.html
dom/xbl/crashtests/492978-1.xul
dom/xbl/crashtests/493123-1.xhtml
dom/xbl/crashtests/495354-1.xhtml
dom/xbl/crashtests/507628-1.xhtml
dom/xbl/crashtests/507991-1.xhtml
dom/xbl/crashtests/830614-1.xul
dom/xbl/crashtests/895805-1.xhtml
dom/xbl/crashtests/crashtests.list
dom/xbl/crashtests/set-field-bad-this.xhtml
dom/xbl/moz.build
dom/xbl/nsBindingManager.cpp
dom/xbl/nsBindingManager.h
dom/xbl/nsXBLBinding.cpp
dom/xbl/nsXBLBinding.h
dom/xbl/nsXBLContentSink.cpp
dom/xbl/nsXBLContentSink.h
dom/xbl/nsXBLDocumentInfo.cpp
dom/xbl/nsXBLDocumentInfo.h
dom/xbl/nsXBLEventHandler.cpp
dom/xbl/nsXBLEventHandler.h
dom/xbl/nsXBLMaybeCompiled.h
dom/xbl/nsXBLProtoImpl.cpp
dom/xbl/nsXBLProtoImpl.h
dom/xbl/nsXBLProtoImplField.cpp
dom/xbl/nsXBLProtoImplField.h
dom/xbl/nsXBLProtoImplMember.h
dom/xbl/nsXBLProtoImplMethod.cpp
dom/xbl/nsXBLProtoImplMethod.h
dom/xbl/nsXBLProtoImplProperty.cpp
dom/xbl/nsXBLProtoImplProperty.h
dom/xbl/nsXBLPrototypeBinding.cpp
dom/xbl/nsXBLPrototypeBinding.h
dom/xbl/nsXBLPrototypeHandler.cpp
dom/xbl/nsXBLPrototypeHandler.h
dom/xbl/nsXBLPrototypeResources.cpp
dom/xbl/nsXBLPrototypeResources.h
dom/xbl/nsXBLResourceLoader.cpp
dom/xbl/nsXBLResourceLoader.h
dom/xbl/nsXBLSerialize.cpp
dom/xbl/nsXBLSerialize.h
dom/xbl/nsXBLService.cpp
dom/xbl/nsXBLService.h
dom/xbl/nsXBLWindowKeyHandler.cpp
dom/xbl/nsXBLWindowKeyHandler.h
dom/xbl/test/bug310107-resource.xhtml
dom/xbl/test/chrome.ini
dom/xbl/test/file_bug372769.xhtml
dom/xbl/test/file_bug379959_cross.html
dom/xbl/test/file_bug379959_data.html
dom/xbl/test/file_bug379959_xbl.xml
dom/xbl/test/file_bug397934.xhtml
dom/xbl/test/file_bug481558.xbl
dom/xbl/test/file_bug481558css.sjs
dom/xbl/test/file_bug591198_inner.html
dom/xbl/test/file_bug591198_xbl.xml
dom/xbl/test/file_bug821850.xhtml
dom/xbl/test/file_bug844783.xhtml
dom/xbl/test/file_bug944407.html
dom/xbl/test/file_bug944407.xml
dom/xbl/test/file_bug950909.html
dom/xbl/test/file_bug950909.xml
dom/xbl/test/mochitest.ini
dom/xbl/test/moz.build
dom/xbl/test/test_bug310107.html
dom/xbl/test/test_bug366770.html
dom/xbl/test/test_bug371724.xhtml
dom/xbl/test/test_bug372769.html
dom/xbl/test/test_bug378518.xul
dom/xbl/test/test_bug378866.xhtml
dom/xbl/test/test_bug379959.html
dom/xbl/test/test_bug389322.xhtml
dom/xbl/test/test_bug397934.html
dom/xbl/test/test_bug398135.xul
dom/xbl/test/test_bug398492.xul
dom/xbl/test/test_bug400705.xhtml
dom/xbl/test/test_bug401907.xhtml
dom/xbl/test/test_bug403162.xhtml
dom/xbl/test/test_bug468210.xhtml
dom/xbl/test/test_bug481558.html
dom/xbl/test/test_bug526178.xhtml
dom/xbl/test/test_bug542406.xhtml
dom/xbl/test/test_bug591198.html
dom/xbl/test/test_bug639338.xhtml
dom/xbl/test/test_bug721452.xul
dom/xbl/test/test_bug723676.xul
dom/xbl/test/test_bug772966.xul
dom/xbl/test/test_bug790265.xhtml
dom/xbl/test/test_bug821850.html
dom/xbl/test/test_bug844783.html
dom/xbl/test/test_bug944407.xul
dom/xbl/test/test_bug950909.xul
layout/base/moz.build
layout/build/moz.build
layout/inspector/moz.build
layout/style/moz.build
testing/crashtest/crashtests.list
testing/mochitest/b2g-desktop.json
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -54,27 +54,27 @@ UNIFIED_SOURCES += [
 ]
 
 if a11y_log:
     UNIFIED_SOURCES += [
         'Logging.cpp',
     ]
 
 LOCAL_INCLUDES += [
-    '../../../content/xbl/src',
-    '../../../ipc/chromium/src',
-    '../../../layout/generic',
-    '../../../layout/style',
-    '../../../layout/svg',
-    '../../../layout/xul',
-    '../../../layout/xul/tree/',
     '../generic',
     '../html',
     '../xpcom',
     '../xul',
+    '/dom/xbl',
+    '/ipc/chromium/src',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/svg',
+    '/layout/xul',
+    '/layout/xul/tree/',
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
         '../atk',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -192,25 +192,25 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
-    '/content/xbl/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
+    '/dom/xbl',
     '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -166,19 +166,19 @@ include('/ipc/chromium/chromium-config.m
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
     '/content/html/document/src',
     '/content/media/',
-    '/content/xbl/src',
     '/content/xul/content/src',
     '/dom/base',
+    '/dom/xbl',
     '/editor/libeditor/base',
     '/editor/libeditor/text',
     '/editor/txmgr/src',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
--- a/content/moz.build
+++ b/content/moz.build
@@ -9,13 +9,12 @@ PARALLEL_DIRS += [
     'canvas',
     'events',
     'html',
     'mathml/content/src',
     'media',
     'svg',
     'xml',
     'xul',
-    'xbl',
 ]
 
 TEST_TOOL_DIRS += ['test']
 
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -247,18 +247,18 @@ FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/html/content/src',
-    '/content/xbl/src',
     '/content/xml/content/src',
     '/dom',
     '/dom/smil',
+    '/dom/xbl',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
     '/layout/xul',
 ]
 
deleted file mode 100644
--- a/content/xbl/moz.build
+++ /dev/null
@@ -1,8 +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/.
-
-PARALLEL_DIRS += ['src', 'builtin']
-TEST_DIRS += ['test']
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -16,18 +16,18 @@ if CONFIG['MOZ_XUL']:
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../../document/src',
     '../../templates/src',
     '/content/base/src',
     '/content/events/src',
     '/content/html/content/src',
-    '/content/xbl/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
+    '/dom/xbl',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -19,22 +19,22 @@ if CONFIG['MOZ_XUL']:
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
-    '/content/xbl/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/base',
+    '/dom/xbl',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -138,20 +138,20 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
     '../media',
     '../network/src',
     '../src/geolocation',
     '../src/storage',
     '../time',
+    '../xbl',
     '/content/base/src',
     '/content/events/src',
     '/content/html/document/src',
-    '/content/xbl/src',
     '/content/xul/document/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     LOCAL_INCLUDES += [
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -41,28 +41,28 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
     '/content/svg/content/src',
-    '/content/xbl/src',
     '/content/xml/content/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',
     '/dom/workers',
+    '/dom/xbl',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/style',
     '/layout/xul/tree',
     '/media/mtransport',
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -72,16 +72,17 @@ PARALLEL_DIRS += [
     'workers',
     'camera',
     'audiochannel',
     'promise',
     'smil',
     'telephony',
     'inputmethod',
     'webidl',
+    'xbl',
     'xslt',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     PARALLEL_DIRS += ['plugins/ipc/hangui']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     PARALLEL_DIRS += [
rename from content/xbl/src/XBLChildrenElement.cpp
rename to dom/xbl/XBLChildrenElement.cpp
rename from content/xbl/src/XBLChildrenElement.h
rename to dom/xbl/XBLChildrenElement.h
rename from content/xbl/builtin/android/jar.mn
rename to dom/xbl/builtin/android/jar.mn
rename from content/xbl/builtin/android/moz.build
rename to dom/xbl/builtin/android/moz.build
rename from content/xbl/builtin/android/platformHTMLBindings.xml
rename to dom/xbl/builtin/android/platformHTMLBindings.xml
rename from content/xbl/builtin/browser-base.inc
rename to dom/xbl/builtin/browser-base.inc
rename from content/xbl/builtin/editor-base.inc
rename to dom/xbl/builtin/editor-base.inc
rename from content/xbl/builtin/emacs/jar.mn
rename to dom/xbl/builtin/emacs/jar.mn
rename from content/xbl/builtin/emacs/moz.build
rename to dom/xbl/builtin/emacs/moz.build
rename from content/xbl/builtin/emacs/platformHTMLBindings.xml
rename to dom/xbl/builtin/emacs/platformHTMLBindings.xml
rename from content/xbl/builtin/input-fields-base.inc
rename to dom/xbl/builtin/input-fields-base.inc
rename from content/xbl/builtin/mac/jar.mn
rename to dom/xbl/builtin/mac/jar.mn
rename from content/xbl/builtin/mac/moz.build
rename to dom/xbl/builtin/mac/moz.build
rename from content/xbl/builtin/mac/platformHTMLBindings.xml
rename to dom/xbl/builtin/mac/platformHTMLBindings.xml
rename from content/xbl/builtin/moz.build
rename to dom/xbl/builtin/moz.build
rename from content/xbl/builtin/textareas-base.inc
rename to dom/xbl/builtin/textareas-base.inc
rename from content/xbl/builtin/unix/jar.mn
rename to dom/xbl/builtin/unix/jar.mn
rename from content/xbl/builtin/unix/moz.build
rename to dom/xbl/builtin/unix/moz.build
rename from content/xbl/builtin/unix/platformHTMLBindings.xml
rename to dom/xbl/builtin/unix/platformHTMLBindings.xml
rename from content/xbl/builtin/win/jar.mn
rename to dom/xbl/builtin/win/jar.mn
rename from content/xbl/builtin/win/moz.build
rename to dom/xbl/builtin/win/moz.build
rename from content/xbl/builtin/win/platformHTMLBindings.xml
rename to dom/xbl/builtin/win/platformHTMLBindings.xml
rename from content/xbl/crashtests/205735-1.xhtml
rename to dom/xbl/crashtests/205735-1.xhtml
rename from content/xbl/crashtests/223799-1.xul
rename to dom/xbl/crashtests/223799-1.xul
rename from content/xbl/crashtests/226744-1.xhtml
rename to dom/xbl/crashtests/226744-1.xhtml
rename from content/xbl/crashtests/232095-1.xul
rename to dom/xbl/crashtests/232095-1.xul
rename from content/xbl/crashtests/277523-1.xhtml
rename to dom/xbl/crashtests/277523-1.xhtml
rename from content/xbl/crashtests/277950-1.xhtml
rename to dom/xbl/crashtests/277950-1.xhtml
rename from content/xbl/crashtests/336744-1-inner.html
rename to dom/xbl/crashtests/336744-1-inner.html
rename from content/xbl/crashtests/336744-1.html
rename to dom/xbl/crashtests/336744-1.html
rename from content/xbl/crashtests/336960-1-inner.xhtml
rename to dom/xbl/crashtests/336960-1-inner.xhtml
rename from content/xbl/crashtests/336960-1.html
rename to dom/xbl/crashtests/336960-1.html
rename from content/xbl/crashtests/342954-1.xhtml
rename to dom/xbl/crashtests/342954-1.xhtml
rename from content/xbl/crashtests/342954-2-xbl.xml
rename to dom/xbl/crashtests/342954-2-xbl.xml
rename from content/xbl/crashtests/342954-2.xhtml
rename to dom/xbl/crashtests/342954-2.xhtml
rename from content/xbl/crashtests/368276-1.xhtml
rename to dom/xbl/crashtests/368276-1.xhtml
rename from content/xbl/crashtests/368641-1.xhtml
rename to dom/xbl/crashtests/368641-1.xhtml
rename from content/xbl/crashtests/378521-1.xhtml
rename to dom/xbl/crashtests/378521-1.xhtml
rename from content/xbl/crashtests/382376-1.xhtml
rename to dom/xbl/crashtests/382376-1.xhtml
rename from content/xbl/crashtests/382376-2.xhtml
rename to dom/xbl/crashtests/382376-2.xhtml
rename from content/xbl/crashtests/397596-1.xhtml
rename to dom/xbl/crashtests/397596-1.xhtml
rename from content/xbl/crashtests/404125-1.xhtml
rename to dom/xbl/crashtests/404125-1.xhtml
rename from content/xbl/crashtests/406900-1.xul
rename to dom/xbl/crashtests/406900-1.xul
rename from content/xbl/crashtests/406904-1.xhtml
rename to dom/xbl/crashtests/406904-1.xhtml
rename from content/xbl/crashtests/406904-2.xhtml
rename to dom/xbl/crashtests/406904-2.xhtml
rename from content/xbl/crashtests/415192-1.xul
rename to dom/xbl/crashtests/415192-1.xul
rename from content/xbl/crashtests/415301-1.xul
rename to dom/xbl/crashtests/415301-1.xul
rename from content/xbl/crashtests/418133-1.xhtml
rename to dom/xbl/crashtests/418133-1.xhtml
rename from content/xbl/crashtests/420233-1.xhtml
rename to dom/xbl/crashtests/420233-1.xhtml
rename from content/xbl/crashtests/421997-1.xhtml
rename to dom/xbl/crashtests/421997-1.xhtml
rename from content/xbl/crashtests/432813-1-xbl.xml
rename to dom/xbl/crashtests/432813-1-xbl.xml
rename from content/xbl/crashtests/432813-1.xhtml
rename to dom/xbl/crashtests/432813-1.xhtml
rename from content/xbl/crashtests/454820-1.html
rename to dom/xbl/crashtests/454820-1.html
rename from content/xbl/crashtests/460665-1.xhtml
rename to dom/xbl/crashtests/460665-1.xhtml
rename from content/xbl/crashtests/463511-1.xhtml
rename to dom/xbl/crashtests/463511-1.xhtml
rename from content/xbl/crashtests/464863-1.xhtml
rename to dom/xbl/crashtests/464863-1.xhtml
rename from content/xbl/crashtests/472260-1.xhtml
rename to dom/xbl/crashtests/472260-1.xhtml
rename from content/xbl/crashtests/477878-1.html
rename to dom/xbl/crashtests/477878-1.html
rename from content/xbl/crashtests/492978-1.xul
rename to dom/xbl/crashtests/492978-1.xul
rename from content/xbl/crashtests/493123-1.xhtml
rename to dom/xbl/crashtests/493123-1.xhtml
rename from content/xbl/crashtests/495354-1.xhtml
rename to dom/xbl/crashtests/495354-1.xhtml
rename from content/xbl/crashtests/507628-1.xhtml
rename to dom/xbl/crashtests/507628-1.xhtml
rename from content/xbl/crashtests/507991-1.xhtml
rename to dom/xbl/crashtests/507991-1.xhtml
rename from content/xbl/crashtests/830614-1.xul
rename to dom/xbl/crashtests/830614-1.xul
rename from content/xbl/crashtests/895805-1.xhtml
rename to dom/xbl/crashtests/895805-1.xhtml
rename from content/xbl/crashtests/crashtests.list
rename to dom/xbl/crashtests/crashtests.list
rename from content/xbl/crashtests/set-field-bad-this.xhtml
rename to dom/xbl/crashtests/set-field-bad-this.xhtml
rename from content/xbl/src/moz.build
rename to dom/xbl/moz.build
--- a/content/xbl/src/moz.build
+++ b/dom/xbl/moz.build
@@ -1,14 +1,17 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+PARALLEL_DIRS += ['builtin']
+TEST_DIRS += ['test']
+
 EXPORTS += [
     'nsBindingManager.h',
     'nsXBLBinding.h',
     'nsXBLService.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'XBLChildrenElement.h',
rename from content/xbl/src/nsBindingManager.cpp
rename to dom/xbl/nsBindingManager.cpp
rename from content/xbl/src/nsBindingManager.h
rename to dom/xbl/nsBindingManager.h
rename from content/xbl/src/nsXBLBinding.cpp
rename to dom/xbl/nsXBLBinding.cpp
rename from content/xbl/src/nsXBLBinding.h
rename to dom/xbl/nsXBLBinding.h
rename from content/xbl/src/nsXBLContentSink.cpp
rename to dom/xbl/nsXBLContentSink.cpp
rename from content/xbl/src/nsXBLContentSink.h
rename to dom/xbl/nsXBLContentSink.h
rename from content/xbl/src/nsXBLDocumentInfo.cpp
rename to dom/xbl/nsXBLDocumentInfo.cpp
rename from content/xbl/src/nsXBLDocumentInfo.h
rename to dom/xbl/nsXBLDocumentInfo.h
rename from content/xbl/src/nsXBLEventHandler.cpp
rename to dom/xbl/nsXBLEventHandler.cpp
rename from content/xbl/src/nsXBLEventHandler.h
rename to dom/xbl/nsXBLEventHandler.h
rename from content/xbl/src/nsXBLMaybeCompiled.h
rename to dom/xbl/nsXBLMaybeCompiled.h
rename from content/xbl/src/nsXBLProtoImpl.cpp
rename to dom/xbl/nsXBLProtoImpl.cpp
rename from content/xbl/src/nsXBLProtoImpl.h
rename to dom/xbl/nsXBLProtoImpl.h
rename from content/xbl/src/nsXBLProtoImplField.cpp
rename to dom/xbl/nsXBLProtoImplField.cpp
rename from content/xbl/src/nsXBLProtoImplField.h
rename to dom/xbl/nsXBLProtoImplField.h
rename from content/xbl/src/nsXBLProtoImplMember.h
rename to dom/xbl/nsXBLProtoImplMember.h
rename from content/xbl/src/nsXBLProtoImplMethod.cpp
rename to dom/xbl/nsXBLProtoImplMethod.cpp
rename from content/xbl/src/nsXBLProtoImplMethod.h
rename to dom/xbl/nsXBLProtoImplMethod.h
rename from content/xbl/src/nsXBLProtoImplProperty.cpp
rename to dom/xbl/nsXBLProtoImplProperty.cpp
rename from content/xbl/src/nsXBLProtoImplProperty.h
rename to dom/xbl/nsXBLProtoImplProperty.h
rename from content/xbl/src/nsXBLPrototypeBinding.cpp
rename to dom/xbl/nsXBLPrototypeBinding.cpp
rename from content/xbl/src/nsXBLPrototypeBinding.h
rename to dom/xbl/nsXBLPrototypeBinding.h
rename from content/xbl/src/nsXBLPrototypeHandler.cpp
rename to dom/xbl/nsXBLPrototypeHandler.cpp
rename from content/xbl/src/nsXBLPrototypeHandler.h
rename to dom/xbl/nsXBLPrototypeHandler.h
rename from content/xbl/src/nsXBLPrototypeResources.cpp
rename to dom/xbl/nsXBLPrototypeResources.cpp
rename from content/xbl/src/nsXBLPrototypeResources.h
rename to dom/xbl/nsXBLPrototypeResources.h
rename from content/xbl/src/nsXBLResourceLoader.cpp
rename to dom/xbl/nsXBLResourceLoader.cpp
rename from content/xbl/src/nsXBLResourceLoader.h
rename to dom/xbl/nsXBLResourceLoader.h
rename from content/xbl/src/nsXBLSerialize.cpp
rename to dom/xbl/nsXBLSerialize.cpp
rename from content/xbl/src/nsXBLSerialize.h
rename to dom/xbl/nsXBLSerialize.h
rename from content/xbl/src/nsXBLService.cpp
rename to dom/xbl/nsXBLService.cpp
rename from content/xbl/src/nsXBLService.h
rename to dom/xbl/nsXBLService.h
rename from content/xbl/src/nsXBLWindowKeyHandler.cpp
rename to dom/xbl/nsXBLWindowKeyHandler.cpp
rename from content/xbl/src/nsXBLWindowKeyHandler.h
rename to dom/xbl/nsXBLWindowKeyHandler.h
rename from content/xbl/test/bug310107-resource.xhtml
rename to dom/xbl/test/bug310107-resource.xhtml
rename from content/xbl/test/chrome.ini
rename to dom/xbl/test/chrome.ini
rename from content/xbl/test/file_bug372769.xhtml
rename to dom/xbl/test/file_bug372769.xhtml
rename from content/xbl/test/file_bug379959_cross.html
rename to dom/xbl/test/file_bug379959_cross.html
--- a/content/xbl/test/file_bug379959_cross.html
+++ b/dom/xbl/test/file_bug379959_cross.html
@@ -3,17 +3,17 @@
 <head>
 <style>
 #div1 {
   color: green;
   -moz-binding: url(file_bug379959_xbl.xml#xbltest);
 }
 #div2 {
   color: green;
-  -moz-binding: url(http://example.com/tests/content/xbl/test/file_bug379959_xbl.xml#xbltest);
+  -moz-binding: url(http://example.com/tests/dom/xbl/test/file_bug379959_xbl.xml#xbltest);
 }
 </style>
 <body>
 <div id="div1"></div>
 <div id="div2"></div>
 <script>
 onload = function() {
   nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('div1'));
rename from content/xbl/test/file_bug379959_data.html
rename to dom/xbl/test/file_bug379959_data.html
rename from content/xbl/test/file_bug379959_xbl.xml
rename to dom/xbl/test/file_bug379959_xbl.xml
rename from content/xbl/test/file_bug397934.xhtml
rename to dom/xbl/test/file_bug397934.xhtml
rename from content/xbl/test/file_bug481558.xbl
rename to dom/xbl/test/file_bug481558.xbl
rename from content/xbl/test/file_bug481558css.sjs
rename to dom/xbl/test/file_bug481558css.sjs
--- a/content/xbl/test/file_bug481558css.sjs
+++ b/dom/xbl/test/file_bug481558css.sjs
@@ -4,14 +4,14 @@ function handleRequest(request, response
   request.queryString.split('&').forEach(function (val) {
     [name, value] = val.split('=');
     query[name] = unescape(value);
   });
 
   response.setHeader("Content-Type", "text/css", false);
   css = "#" + query.id + " { -moz-binding: url(\"";
   if (query.server) {
-    css += "http://" + query.server + "/tests/content/xbl/test/";
+    css += "http://" + query.server + "/tests/dom/xbl/test/";
   }
   css += "file_bug481558.xbl#test\"); }";
 
   response.write(css);
 }
rename from content/xbl/test/file_bug591198_inner.html
rename to dom/xbl/test/file_bug591198_inner.html
rename from content/xbl/test/file_bug591198_xbl.xml
rename to dom/xbl/test/file_bug591198_xbl.xml
rename from content/xbl/test/file_bug821850.xhtml
rename to dom/xbl/test/file_bug821850.xhtml
rename from content/xbl/test/file_bug844783.xhtml
rename to dom/xbl/test/file_bug844783.xhtml
rename from content/xbl/test/file_bug944407.html
rename to dom/xbl/test/file_bug944407.html
--- a/content/xbl/test/file_bug944407.html
+++ b/dom/xbl/test/file_bug944407.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <body>
 <div id="deny" style="-moz-binding: url(file_bug944407.xml#testAllowScript)"></div>
-<div id="allow" style="-moz-binding: url(chrome://mochitests/content/chrome/content/xbl/test/file_bug944407.xml#testAllowScript)"</div>
+<div id="allow" style="-moz-binding: url(chrome://mochitests/content/chrome/dom/xbl/test/file_bug944407.xml#testAllowScript)"</div>
 <script>/* Flush layout with a script tab - see bug 944407 comment 37. */</script>
 </body>
 </html>
rename from content/xbl/test/file_bug944407.xml
rename to dom/xbl/test/file_bug944407.xml
rename from content/xbl/test/file_bug950909.html
rename to dom/xbl/test/file_bug950909.html
--- a/content/xbl/test/file_bug950909.html
+++ b/dom/xbl/test/file_bug950909.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 <body>
-<div style="-moz-binding: url(chrome://mochitests/content/chrome/content/xbl/test/file_bug950909.xml#testBinding"></div>
+<div style="-moz-binding: url(chrome://mochitests/content/chrome/dom/xbl/test/file_bug950909.xml#testBinding"></div>
 </body>
 </html>
rename from content/xbl/test/file_bug950909.xml
rename to dom/xbl/test/file_bug950909.xml
rename from content/xbl/test/mochitest.ini
rename to dom/xbl/test/mochitest.ini
rename from content/xbl/test/moz.build
rename to dom/xbl/test/moz.build
rename from content/xbl/test/test_bug310107.html
rename to dom/xbl/test/test_bug310107.html
rename from content/xbl/test/test_bug366770.html
rename to dom/xbl/test/test_bug366770.html
rename from content/xbl/test/test_bug371724.xhtml
rename to dom/xbl/test/test_bug371724.xhtml
rename from content/xbl/test/test_bug372769.html
rename to dom/xbl/test/test_bug372769.html
rename from content/xbl/test/test_bug378518.xul
rename to dom/xbl/test/test_bug378518.xul
rename from content/xbl/test/test_bug378866.xhtml
rename to dom/xbl/test/test_bug378866.xhtml
rename from content/xbl/test/test_bug379959.html
rename to dom/xbl/test/test_bug379959.html
rename from content/xbl/test/test_bug389322.xhtml
rename to dom/xbl/test/test_bug389322.xhtml
rename from content/xbl/test/test_bug397934.html
rename to dom/xbl/test/test_bug397934.html
rename from content/xbl/test/test_bug398135.xul
rename to dom/xbl/test/test_bug398135.xul
rename from content/xbl/test/test_bug398492.xul
rename to dom/xbl/test/test_bug398492.xul
rename from content/xbl/test/test_bug400705.xhtml
rename to dom/xbl/test/test_bug400705.xhtml
rename from content/xbl/test/test_bug401907.xhtml
rename to dom/xbl/test/test_bug401907.xhtml
rename from content/xbl/test/test_bug403162.xhtml
rename to dom/xbl/test/test_bug403162.xhtml
rename from content/xbl/test/test_bug468210.xhtml
rename to dom/xbl/test/test_bug468210.xhtml
rename from content/xbl/test/test_bug481558.html
rename to dom/xbl/test/test_bug481558.html
--- a/content/xbl/test/test_bug481558.html
+++ b/dom/xbl/test/test_bug481558.html
@@ -6,18 +6,18 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <title>Test for Bug 481558</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <link rel="stylesheet" type="text/css"
         href="file_bug481558css.sjs?id=id1">
   <link rel="stylesheet" type="text/css"
         href="file_bug481558css.sjs?id=id2&server=example.com">
-  <link rel="stylesheet" type="text/css" href="http://example.com/tests/content/xbl/test/file_bug481558css.sjs?id=id3">
-  <link rel="stylesheet" type="text/css" href="http://example.com/tests/content/xbl/test/file_bug481558css.sjs?id=id4&server=localhost:8888">
+  <link rel="stylesheet" type="text/css" href="http://example.com/tests/dom/xbl/test/file_bug481558css.sjs?id=id3">
+  <link rel="stylesheet" type="text/css" href="http://example.com/tests/dom/xbl/test/file_bug481558css.sjs?id=id4&server=localhost:8888">
 </head>
 <body onload="runTest();">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=481558">Mozilla Bug 481558</a>
 <p id="id1"></p>
 <p id="id2"></p>
 <p id="id3"></p>
 <p id="id4"></p>
 <pre id="test">
rename from content/xbl/test/test_bug526178.xhtml
rename to dom/xbl/test/test_bug526178.xhtml
rename from content/xbl/test/test_bug542406.xhtml
rename to dom/xbl/test/test_bug542406.xhtml
rename from content/xbl/test/test_bug591198.html
rename to dom/xbl/test/test_bug591198.html
--- a/content/xbl/test/test_bug591198.html
+++ b/dom/xbl/test/test_bug591198.html
@@ -25,17 +25,17 @@ function runTest() {
   }, false);
   
   iframe.src = "file_bug591198_inner.html";
   let res = (yield);
   is(res.widths[0], res.widths[2], "binding was rendered");
   isnot(res.widths[0], res.widths[1], "binding was rendered");
   is(res.anonChildCount, 2, "correct number of anon children");
 
-  iframe.src = "http://noxul.example.com/tests/content/xbl/test/file_bug591198_inner.html";
+  iframe.src = "http://noxul.example.com/tests/dom/xbl/test/file_bug591198_inner.html";
   let res = (yield);
   is(res.widths[0], res.widths[1], "binding was not rendered");
   isnot(res.widths[0], res.widths[2], "binding was not rendered");
   is("anonChildCount" in res, false, "no anon children");
 
   SimpleTest.finish();
   yield undefined;
 }
rename from content/xbl/test/test_bug639338.xhtml
rename to dom/xbl/test/test_bug639338.xhtml
rename from content/xbl/test/test_bug721452.xul
rename to dom/xbl/test/test_bug721452.xul
rename from content/xbl/test/test_bug723676.xul
rename to dom/xbl/test/test_bug723676.xul
rename from content/xbl/test/test_bug772966.xul
rename to dom/xbl/test/test_bug772966.xul
rename from content/xbl/test/test_bug790265.xhtml
rename to dom/xbl/test/test_bug790265.xhtml
rename from content/xbl/test/test_bug821850.html
rename to dom/xbl/test/test_bug821850.html
rename from content/xbl/test/test_bug844783.html
rename to dom/xbl/test/test_bug844783.html
rename from content/xbl/test/test_bug944407.xul
rename to dom/xbl/test/test_bug944407.xul
--- a/content/xbl/test/test_bug944407.xul
+++ b/dom/xbl/test/test_bug944407.xul
@@ -23,17 +23,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   const Cu = Components.utils;
   Cu.import('resource://gre/modules/Services.jsm');
 
   function go() {
 
     // Disable javascript, and load the frame.
     function loadFrame() {
       ok(!Services.prefs.getBoolPref('javascript.enabled'), "Javascript should be disabled");
-      $('ifr').setAttribute('src', 'http://mochi.test:8888/tests/content/xbl/test/file_bug944407.html');
+      $('ifr').setAttribute('src', 'http://mochi.test:8888/tests/dom/xbl/test/file_bug944407.html');
     }
     SpecialPowers.pushPrefEnv({ set: [['javascript.enabled', false]] }, loadFrame);
   }
 
   function finish() {
     SimpleTest.finish();
   }
 
rename from content/xbl/test/test_bug950909.xul
rename to dom/xbl/test/test_bug950909.xul
--- a/content/xbl/test/test_bug950909.xul
+++ b/dom/xbl/test/test_bug950909.xul
@@ -27,10 +27,10 @@ https://bugzilla.mozilla.org/show_bug.cg
    */
 
   // Just wait. When the iframe loads, it'll apply the binding, which will
   // trigger the constructor for the binding.
   SimpleTest.waitForExplicitFinish();
 
   ]]>
   </script>
-  <iframe src="http://example.com/tests/content/xbl/test/file_bug950909.html"/>
+  <iframe src="http://example.com/tests/dom/xbl/test/file_bug950909.html"/>
 </window>
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -111,29 +111,29 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/events/src',
     '../../content/html/content/src',
     '../../content/svg/content/src',
-    '../../content/xbl/src',
-    '../../dom/base',
     '../../view/src',
     '../forms',
     '../generic',
     '../mathml',
     '../printing',
     '../style',
     '../svg',
     '../tables',
     '../xul',
     '../xul/tree/',
     '/docshell/base',
+    '/dom/base',
+    '/dom/xbl',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -40,33 +40,33 @@ LOCAL_INCLUDES += [
     '../xul',
     '/caps/include',
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xbl/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
     '/dom/file',
     '/dom/media',
     '/dom/speakermanager',
     '/dom/src/geolocation',
     '/dom/src/json',
     '/dom/src/jsurl',
     '/dom/src/offline',
     '/dom/src/storage',
     '/dom/telephony',
+    '/dom/xbl',
     '/dom/xslt/base',
     '/dom/xslt/xml',
     '/dom/xslt/xpath',
     '/dom/xslt/xslt',
     '/editor/composer/src',
     '/editor/libeditor/base',
     '/editor/libeditor/html',
     '/editor/libeditor/text',
--- a/layout/inspector/moz.build
+++ b/layout/inspector/moz.build
@@ -40,16 +40,16 @@ if CONFIG['MOZ_XUL']:
     ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '../style',
     '/content/base/src',
-    '/content/xbl/src',
+    '/dom/xbl',
 ]
 
 if CONFIG['ENABLE_TESTS']:
     PARALLEL_DIRS += [
         'tests',
         'tests/chrome',
     ]
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -142,17 +142,17 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
-    '../../content/xbl/src',
     '../../content/xul/document/src',
     '../base',
     '../generic',
     '../xul',
     '/dom/base',
+    '/dom/xbl',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -8,31 +8,31 @@ include ../../accessible/tests/crashtest
 include ../../content/base/crashtests/crashtests.list
 include ../../content/canvas/crashtests/crashtests.list
 include ../../content/events/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/svg/content/src/crashtests/crashtests.list
 include ../../content/xml/content/crashtest/crashtests.list
 include ../../content/xml/document/crashtests/crashtests.list
-include ../../content/xbl/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 ../../content/mathml/content/crashtests/crashtests.list
 
 # Bug 868152 - webaudio crash on tegra platform
 skip-if(Android) include ../../content/media/test/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
 include ../../dom/base/crashtests/crashtests.list
 include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
+include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xslt/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
 skip-if(B2G||browserIsRemote) include ../../dom/media/tests/crashtests/crashtests.list
 
 include ../../dom/src/offline/crashtests/crashtests.list
 include ../../dom/src/jsurl/crashtests/crashtests.list
 
--- a/testing/mochitest/b2g-desktop.json
+++ b/testing/mochitest/b2g-desktop.json
@@ -434,17 +434,16 @@
     "content/html/content/test/test_mozaudiochannel.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_mozaudiochannel.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_mozaudiochannel.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_mozaudiochannel.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_mozaudiochannel.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/document/test/test_bug196523.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/document/test/test_bug199692.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/document/test/test_bug871161.html": "Bug 931116, b2g desktop specific, initial triage",
-    "content/xbl/test/test_bug310107.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/xml/document/test/test_bug691215.html": "Bug 931116, b2g desktop specific, initial triage",
     "docshell/test/navigation/test_bug278916.html": "Bug 931116, b2g desktop specific, initial triage",
     "docshell/test/navigation/test_bug279495.html": "Bug 931116, b2g desktop specific, initial triage",
     "docshell/test/navigation/test_bug430723.html": "Bug 931116, b2g desktop specific, initial triage",
     "docshell/test/navigation/test_opener.html": "Bug 931116, b2g desktop specific, initial triage",
     "docshell/test/navigation/test_sessionhistory.html": "Bug 931116, b2g desktop specific, initial triage",
     "docshell/test/navigation/test_sibling-off-domain.html": "Bug 931116, b2g desktop specific, initial triage",
     "docshell/test/test_bfcache_plus_hash.html": "Bug 931116, b2g desktop specific, initial triage",
@@ -663,16 +662,17 @@
     "dom/tests/mochitest/general/test_bug628069_1.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/tests/mochitest/general/test_bug631440.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/tests/mochitest/general/test_interfaces.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/tests/mochitest/general/test_windowProperties.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/tests/mochitest/general/test_windowedhistoryframes.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/tests/mochitest/sessionstorage/test_sessionStorageClone.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/tests/mochitest/sessionstorage/test_sessionStorageReplace.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/tests/mochitest/whatwg/test_postMessage_closed.html": "Bug 931116, b2g desktop specific, initial triage",
+    "dom/xbl/test/test_bug310107.html": "Bug 931116, b2g desktop specific, initial triage",
     "layout/base/tests/test_bug607529.html": "Bug 931116, b2g desktop specific, initial triage",
     "layout/base/tests/test_bug858459.html": "Bug 931116, b2g desktop specific, initial triage",
     "layout/base/tests/test_remote_frame.html": "Bug 931116, b2g desktop specific, initial triage",
     "layout/generic/test/test_bug735641.html": "Bug 931116, b2g desktop specific, initial triage",
     "layout/generic/test/test_bug784410.html": "Bug 931116, b2g desktop specific, initial triage",
     "layout/generic/test/test_plugin_clipping.xhtml": "Bug 931116, b2g desktop specific, initial triage",
     "layout/generic/test/test_plugin_clipping2.xhtml": "Bug 931116, b2g desktop specific, initial triage",
     "layout/generic/test/test_plugin_clipping_table.xhtml": "Bug 931116, b2g desktop specific, initial triage",