Issue %3005 - Move docshell/ to system/

author: Matt A. Tobin <email@mattatobin.com> 2021-11-22 11:41:22 -0500
committer: Matt A. Tobin <email@mattatobin.com> 2021-11-22 11:41:22 -0500
commit: 7572f6fb227f67f5f820019fe8afa899aa700862 (patch)
tree: 33e53aa11ae6107f5048f313a0e7b1e748baad0f
parent: 3bcef0ff65fa2ab6a482543afd1b1e00dd31cfee (diff)
download: aura-central-7572f6fb227f67f5f820019fe8afa899aa700862.tar.gz
547 files changed, 20 insertions, 24 deletions
diff --git a/caps/moz.build b/caps/moz.build
index 19557fd80..42bb5ded3 100644
--- a/caps/moz.build
+++ b/caps/moz.build
@@ -44,9 +44,9 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/docshell/base',
     '/dom/base',
     '/js/xpconnect/src',
+    '/system/docshell/base',
 ]
 
 if CONFIG['ENABLE_TESTS']:
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 0c2bf3216..f663fe363 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -427,7 +427,6 @@ LOCAL_INCLUDES += [
     '../network',
     '../time',
     '/caps',
-    '/docshell/base',
     '/dom/base',
     '/dom/geolocation',
     '/dom/html',
@@ -452,6 +451,7 @@ LOCAL_INCLUDES += [
     '/layout/xul',
     '/netwerk/base',
     '/security/manager/ssl',
+    '/system/docshell/base',
     '/widget',
     '/xpcom/ds',
 ]
diff --git a/dom/console/moz.build b/dom/console/moz.build
index 540a6b030..e1c530e8a 100644
--- a/dom/console/moz.build
+++ b/dom/console/moz.build
@@ -32,10 +32,10 @@ EXTRA_COMPONENTS += [
 ]
 
 LOCAL_INCLUDES += [
-    '/docshell/base',
     '/dom/base',
     '/dom/workers',
     '/js/xpconnect/src',
+    '/system/docshell/base',
 ]
 
 MOCHITEST_MANIFESTS += [ 'tests/mochitest.ini' ]
diff --git a/dom/events/moz.build b/dom/events/moz.build
index d651167bd..d53b2dd58 100644
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -129,7 +129,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/docshell/base',
     '/dom/base',
     '/dom/html',
     '/dom/settings',
@@ -142,6 +141,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/xul',
     '/layout/xul/tree/',
+    '/system/docshell/base',
 ]
 
 if CONFIG['GNU_CXX']:
diff --git a/dom/html/moz.build b/dom/html/moz.build
index 9cf22144a..80eb65d0a 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -220,7 +220,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/caps',
-    '/docshell/base',
     '/dom/base',
     '/dom/canvas',
     '/dom/media/',
@@ -234,6 +233,7 @@ LOCAL_INCLUDES += [
     '/layout/tables',
     '/layout/xul',
     '/netwerk/base',
+    '/system/docshell/base',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index f5c97940e..0bb292819 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -103,7 +103,6 @@ LOCAL_INCLUDES += [
     '/caps',
     '/components/permissions/src',
     '/components/registry/src',
-    '/docshell/base',
     '/dom/base',
     '/dom/events',
     '/dom/exthandler',
@@ -120,6 +119,7 @@ LOCAL_INCLUDES += [
     '/layout/base',
     '/media/webrtc',
     '/netwerk/base',
+    '/system/docshell/base',
     '/toolkit/xre',
     '/widget',
     '/xpcom/base',
diff --git a/dom/xul/moz.build b/dom/xul/moz.build
index 6bee05884..b3b5cc24a 100644
--- a/dom/xul/moz.build
+++ b/dom/xul/moz.build
@@ -39,7 +39,6 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/docshell/base',
     '/dom/base',
     '/dom/html',
     '/dom/xbl',
@@ -49,6 +48,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
+    '/system/docshell/base',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/embedding/browser/moz.build b/embedding/browser/moz.build
index 4a841bcb5..dc66317ac 100644
--- a/embedding/browser/moz.build
+++ b/embedding/browser/moz.build
@@ -46,10 +46,10 @@ UNIFIED_SOURCES += [
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/docshell/base',
     '/dom/base',
     '/dom/svg',
     '/layout/style',
+    '/system/docshell/base',
 ]
 
 if CONFIG['GNU_CXX']:
diff --git a/embedding/components/windowwatcher/moz.build b/embedding/components/windowwatcher/moz.build
index a4183da32..0cc656e5a 100644
--- a/embedding/components/windowwatcher/moz.build
+++ b/embedding/components/windowwatcher/moz.build
@@ -34,8 +34,8 @@ EXPORTS += [
 FINAL_LIBRARY = 'xul'
 # For nsJSUtils
 LOCAL_INCLUDES += [
-    '/docshell/base',
     '/dom/base',
+    '/system/docshell/base',
 ]
 
 if CONFIG['GNU_CXX']:
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index d2b5b92f2..11d6ee7a6 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -366,10 +366,10 @@ IPDL_SOURCES = [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
-    '/docshell/base',  # for nsDocShell.h
     '/layout/base',    # for TouchManager.h
     '/layout/generic', # for nsTextFrame.h
     '/libs/libyuv/include', # for libyuv.h
+    '/system/docshell/base',  # for nsDocShell.h
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 9db61da07..52854921d 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -186,11 +186,11 @@ LOCAL_INCLUDES += [
     '../view',
     '../xul',
     '../xul/tree/',
-    '/docshell/base',
     '/dom/base',
     '/dom/html',
     '/dom/svg',
     '/dom/xbl',
+    '/system/docshell/base',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/layout/build/moz.build b/layout/build/moz.build
index e0f7750e7..2da3dd9f6 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -29,7 +29,6 @@ LOCAL_INCLUDES += [
     '../xul',
     '/caps',
     '/components/permissions/src',
-    '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/bindings',
@@ -57,6 +56,7 @@ LOCAL_INCLUDES += [
     '/js/xpconnect/src',
     '/netwerk/base',
     '/netwerk/cookie',
+    '/system/docshell/base',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build
index 4b8cc286d..cfa7aa5f4 100644
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -281,11 +281,11 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/docshell/base',
     '/dom/base',
     '/netwerk/protocol/http',
     '/netwerk/socket',
-    '/security/pkix/include'
+    '/security/pkix/include',
+    '/system/docshell/base',
 ]
 
 if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
diff --git a/docshell/base/IHistory.h b/system/docshell/base/IHistory.h
index 137b49733..137b49733 100644
--- a/docshell/base/IHistory.h
+++ b/system/docshell/base/IHistory.h
diff --git a/docshell/base/LoadContext.cpp b/system/docshell/base/LoadContext.cpp
index 4c265e424..4c265e424 100644
--- a/docshell/base/LoadContext.cpp
+++ b/system/docshell/base/LoadContext.cpp
diff --git a/docshell/base/LoadContext.h b/system/docshell/base/LoadContext.h
index 90a6a600b..90a6a600b 100644
--- a/docshell/base/LoadContext.h
+++ b/system/docshell/base/LoadContext.h
diff --git a/docshell/base/SerializedLoadContext.cpp b/system/docshell/base/SerializedLoadContext.cpp
index b51f8ad73..b51f8ad73 100644
--- a/docshell/base/SerializedLoadContext.cpp
+++ b/system/docshell/base/SerializedLoadContext.cpp
diff --git a/docshell/base/SerializedLoadContext.h b/system/docshell/base/SerializedLoadContext.h
index ba4a33d47..ba4a33d47 100644
--- a/docshell/base/SerializedLoadContext.h
+++ b/system/docshell/base/SerializedLoadContext.h
diff --git a/docshell/base/crashtests/1257730-1.html b/system/docshell/base/crashtests/1257730-1.html
index 028a1adb8..028a1adb8 100644
--- a/docshell/base/crashtests/1257730-1.html
+++ b/system/docshell/base/crashtests/1257730-1.html
diff --git a/docshell/base/crashtests/1331295.html b/system/docshell/base/crashtests/1331295.html
index cdcb29e7f..cdcb29e7f 100644
--- a/docshell/base/crashtests/1331295.html
+++ b/system/docshell/base/crashtests/1331295.html
diff --git a/docshell/base/crashtests/1341657.html b/system/docshell/base/crashtests/1341657.html
index 852b8cc80..852b8cc80 100644
--- a/docshell/base/crashtests/1341657.html
+++ b/system/docshell/base/crashtests/1341657.html
diff --git a/docshell/base/crashtests/369126-1.html b/system/docshell/base/crashtests/369126-1.html
index e9dacec30..e9dacec30 100644
--- a/docshell/base/crashtests/369126-1.html
+++ b/system/docshell/base/crashtests/369126-1.html
diff --git a/docshell/base/crashtests/403574-1.xhtml b/system/docshell/base/crashtests/403574-1.xhtml
index cdf7d43a4..cdf7d43a4 100644
--- a/docshell/base/crashtests/403574-1.xhtml
+++ b/system/docshell/base/crashtests/403574-1.xhtml
diff --git a/docshell/base/crashtests/40929-1-inner.html b/system/docshell/base/crashtests/40929-1-inner.html
index 313046a34..313046a34 100644
--- a/docshell/base/crashtests/40929-1-inner.html
+++ b/system/docshell/base/crashtests/40929-1-inner.html
diff --git a/docshell/base/crashtests/40929-1.html b/system/docshell/base/crashtests/40929-1.html
index 90685d9f1..90685d9f1 100644
--- a/docshell/base/crashtests/40929-1.html
+++ b/system/docshell/base/crashtests/40929-1.html
diff --git a/docshell/base/crashtests/430124-1.html b/system/docshell/base/crashtests/430124-1.html
index 8cdbc1d07..8cdbc1d07 100644
--- a/docshell/base/crashtests/430124-1.html
+++ b/system/docshell/base/crashtests/430124-1.html
diff --git a/docshell/base/crashtests/430628-1.html b/system/docshell/base/crashtests/430628-1.html
index 4a68a5a01..4a68a5a01 100644
--- a/docshell/base/crashtests/430628-1.html
+++ b/system/docshell/base/crashtests/430628-1.html
diff --git a/docshell/base/crashtests/432114-1.html b/system/docshell/base/crashtests/432114-1.html
index 8878d6605..8878d6605 100644
--- a/docshell/base/crashtests/432114-1.html
+++ b/system/docshell/base/crashtests/432114-1.html
diff --git a/docshell/base/crashtests/432114-2.html b/system/docshell/base/crashtests/432114-2.html
index f8a101946..f8a101946 100644
--- a/docshell/base/crashtests/432114-2.html
+++ b/system/docshell/base/crashtests/432114-2.html
diff --git a/docshell/base/crashtests/436900-1-inner.html b/system/docshell/base/crashtests/436900-1-inner.html
index 6fe35ccb1..6fe35ccb1 100644
--- a/docshell/base/crashtests/436900-1-inner.html
+++ b/system/docshell/base/crashtests/436900-1-inner.html
diff --git a/docshell/base/crashtests/436900-1.html b/system/docshell/base/crashtests/436900-1.html
index 582d1919d..582d1919d 100644
--- a/docshell/base/crashtests/436900-1.html
+++ b/system/docshell/base/crashtests/436900-1.html
diff --git a/docshell/base/crashtests/436900-2-inner.html b/system/docshell/base/crashtests/436900-2-inner.html
index ea79f75e8..ea79f75e8 100644
--- a/docshell/base/crashtests/436900-2-inner.html
+++ b/system/docshell/base/crashtests/436900-2-inner.html
diff --git a/docshell/base/crashtests/436900-2.html b/system/docshell/base/crashtests/436900-2.html
index 2e1f0c1de..2e1f0c1de 100644
--- a/docshell/base/crashtests/436900-2.html
+++ b/system/docshell/base/crashtests/436900-2.html
diff --git a/docshell/base/crashtests/500328-1.html b/system/docshell/base/crashtests/500328-1.html
index fd97f84ae..fd97f84ae 100644
--- a/docshell/base/crashtests/500328-1.html
+++ b/system/docshell/base/crashtests/500328-1.html
diff --git a/docshell/base/crashtests/514779-1.xhtml b/system/docshell/base/crashtests/514779-1.xhtml
index 16ac3d9d6..16ac3d9d6 100644
--- a/docshell/base/crashtests/514779-1.xhtml
+++ b/system/docshell/base/crashtests/514779-1.xhtml
diff --git a/docshell/base/crashtests/614499-1.html b/system/docshell/base/crashtests/614499-1.html
index 7053a3f52..7053a3f52 100644
--- a/docshell/base/crashtests/614499-1.html
+++ b/system/docshell/base/crashtests/614499-1.html
diff --git a/docshell/base/crashtests/678872-1.html b/system/docshell/base/crashtests/678872-1.html
index 9853bbdae..9853bbdae 100644
--- a/docshell/base/crashtests/678872-1.html
+++ b/system/docshell/base/crashtests/678872-1.html
diff --git a/docshell/base/crashtests/914521.html b/system/docshell/base/crashtests/914521.html
index eb0a43749..eb0a43749 100644
--- a/docshell/base/crashtests/914521.html
+++ b/system/docshell/base/crashtests/914521.html
diff --git a/docshell/base/crashtests/crashtests.list b/system/docshell/base/crashtests/crashtests.list
index bb3a709b9..bb3a709b9 100644
--- a/docshell/base/crashtests/crashtests.list
+++ b/system/docshell/base/crashtests/crashtests.list
diff --git a/docshell/base/moz.build b/system/docshell/base/moz.build
index 697d1a31a..f24596230 100644
--- a/docshell/base/moz.build
+++ b/system/docshell/base/moz.build
@@ -68,7 +68,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/docshell/shistory',
+    '../shistory',
     '/dom/base',
     '/layout/base',
     '/layout/generic',
diff --git a/docshell/base/nsAboutRedirector.cpp b/system/docshell/base/nsAboutRedirector.cpp
index c393fdd13..c393fdd13 100644
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/system/docshell/base/nsAboutRedirector.cpp
diff --git a/docshell/base/nsAboutRedirector.h b/system/docshell/base/nsAboutRedirector.h
index 638f1f7ef..638f1f7ef 100644
--- a/docshell/base/nsAboutRedirector.h
+++ b/system/docshell/base/nsAboutRedirector.h
diff --git a/docshell/base/nsCDefaultURIFixup.idl b/system/docshell/base/nsCDefaultURIFixup.idl
index 60fffdf21..60fffdf21 100644
--- a/docshell/base/nsCDefaultURIFixup.idl
+++ b/system/docshell/base/nsCDefaultURIFixup.idl
diff --git a/docshell/base/nsDSURIContentListener.cpp b/system/docshell/base/nsDSURIContentListener.cpp
index 55cf7d511..55cf7d511 100644
--- a/docshell/base/nsDSURIContentListener.cpp
+++ b/system/docshell/base/nsDSURIContentListener.cpp
diff --git a/docshell/base/nsDSURIContentListener.h b/system/docshell/base/nsDSURIContentListener.h
index f51c28800..f51c28800 100644
--- a/docshell/base/nsDSURIContentListener.h
+++ b/system/docshell/base/nsDSURIContentListener.h
diff --git a/docshell/base/nsDefaultURIFixup.cpp b/system/docshell/base/nsDefaultURIFixup.cpp
index 71690a140..71690a140 100644
--- a/docshell/base/nsDefaultURIFixup.cpp
+++ b/system/docshell/base/nsDefaultURIFixup.cpp
diff --git a/docshell/base/nsDefaultURIFixup.h b/system/docshell/base/nsDefaultURIFixup.h
index d9bc76fea..d9bc76fea 100644
--- a/docshell/base/nsDefaultURIFixup.h
+++ b/system/docshell/base/nsDefaultURIFixup.h
diff --git a/docshell/base/nsDocShell.cpp b/system/docshell/base/nsDocShell.cpp
index 036965700..036965700 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/system/docshell/base/nsDocShell.cpp
diff --git a/docshell/base/nsDocShell.h b/system/docshell/base/nsDocShell.h
index bc5c5eed3..bc5c5eed3 100644
--- a/docshell/base/nsDocShell.h
+++ b/system/docshell/base/nsDocShell.h
diff --git a/docshell/base/nsDocShellEditorData.cpp b/system/docshell/base/nsDocShellEditorData.cpp
index 81722ecd7..81722ecd7 100644
--- a/docshell/base/nsDocShellEditorData.cpp
+++ b/system/docshell/base/nsDocShellEditorData.cpp
diff --git a/docshell/base/nsDocShellEditorData.h b/system/docshell/base/nsDocShellEditorData.h
index 7fc8960d4..7fc8960d4 100644
--- a/docshell/base/nsDocShellEditorData.h
+++ b/system/docshell/base/nsDocShellEditorData.h
diff --git a/docshell/base/nsDocShellEnumerator.cpp b/system/docshell/base/nsDocShellEnumerator.cpp
index 5c5b02361..5c5b02361 100644
--- a/docshell/base/nsDocShellEnumerator.cpp
+++ b/system/docshell/base/nsDocShellEnumerator.cpp
diff --git a/docshell/base/nsDocShellEnumerator.h b/system/docshell/base/nsDocShellEnumerator.h
index 4e30787e7..4e30787e7 100644
--- a/docshell/base/nsDocShellEnumerator.h
+++ b/system/docshell/base/nsDocShellEnumerator.h
diff --git a/docshell/base/nsDocShellLoadInfo.cpp b/system/docshell/base/nsDocShellLoadInfo.cpp
index fe5ccf931..fe5ccf931 100644
--- a/docshell/base/nsDocShellLoadInfo.cpp
+++ b/system/docshell/base/nsDocShellLoadInfo.cpp
diff --git a/docshell/base/nsDocShellLoadInfo.h b/system/docshell/base/nsDocShellLoadInfo.h
index 8a3150178..8a3150178 100644
--- a/docshell/base/nsDocShellLoadInfo.h
+++ b/system/docshell/base/nsDocShellLoadInfo.h
diff --git a/docshell/base/nsDocShellLoadTypes.h b/system/docshell/base/nsDocShellLoadTypes.h
index 21cd56d71..21cd56d71 100644
--- a/docshell/base/nsDocShellLoadTypes.h
+++ b/system/docshell/base/nsDocShellLoadTypes.h
diff --git a/docshell/base/nsDocShellTransferableHooks.cpp b/system/docshell/base/nsDocShellTransferableHooks.cpp
index af3be0bf8..af3be0bf8 100644
--- a/docshell/base/nsDocShellTransferableHooks.cpp
+++ b/system/docshell/base/nsDocShellTransferableHooks.cpp
diff --git a/docshell/base/nsDocShellTransferableHooks.h b/system/docshell/base/nsDocShellTransferableHooks.h
index daca519d5..daca519d5 100644
--- a/docshell/base/nsDocShellTransferableHooks.h
+++ b/system/docshell/base/nsDocShellTransferableHooks.h
diff --git a/docshell/base/nsDownloadHistory.cpp b/system/docshell/base/nsDownloadHistory.cpp
index 5fa44d473..5fa44d473 100644
--- a/docshell/base/nsDownloadHistory.cpp
+++ b/system/docshell/base/nsDownloadHistory.cpp
diff --git a/docshell/base/nsDownloadHistory.h b/system/docshell/base/nsDownloadHistory.h
index 297868c00..297868c00 100644
--- a/docshell/base/nsDownloadHistory.h
+++ b/system/docshell/base/nsDownloadHistory.h
diff --git a/docshell/base/nsIClipboardCommands.idl b/system/docshell/base/nsIClipboardCommands.idl
index 9dcb1401f..9dcb1401f 100644
--- a/docshell/base/nsIClipboardCommands.idl
+++ b/system/docshell/base/nsIClipboardCommands.idl
diff --git a/docshell/base/nsIContentViewer.idl b/system/docshell/base/nsIContentViewer.idl
index d7d58ad69..d7d58ad69 100644
--- a/docshell/base/nsIContentViewer.idl
+++ b/system/docshell/base/nsIContentViewer.idl
diff --git a/docshell/base/nsIContentViewerContainer.idl b/system/docshell/base/nsIContentViewerContainer.idl
index c94b37ea7..c94b37ea7 100644
--- a/docshell/base/nsIContentViewerContainer.idl
+++ b/system/docshell/base/nsIContentViewerContainer.idl
diff --git a/docshell/base/nsIContentViewerEdit.idl b/system/docshell/base/nsIContentViewerEdit.idl
index c8b6b8a02..c8b6b8a02 100644
--- a/docshell/base/nsIContentViewerEdit.idl
+++ b/system/docshell/base/nsIContentViewerEdit.idl
diff --git a/docshell/base/nsIContentViewerFile.idl b/system/docshell/base/nsIContentViewerFile.idl
index dd2adbf30..dd2adbf30 100644
--- a/docshell/base/nsIContentViewerFile.idl
+++ b/system/docshell/base/nsIContentViewerFile.idl
diff --git a/docshell/base/nsIDocCharset.idl b/system/docshell/base/nsIDocCharset.idl
index 5b1b5a8dc..5b1b5a8dc 100644
--- a/docshell/base/nsIDocCharset.idl
+++ b/system/docshell/base/nsIDocCharset.idl
diff --git a/docshell/base/nsIDocShell.idl b/system/docshell/base/nsIDocShell.idl
index 0e3c4f199..0e3c4f199 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/system/docshell/base/nsIDocShell.idl
diff --git a/docshell/base/nsIDocShellLoadInfo.idl b/system/docshell/base/nsIDocShellLoadInfo.idl
index 2f52ef0aa..2f52ef0aa 100644
--- a/docshell/base/nsIDocShellLoadInfo.idl
+++ b/system/docshell/base/nsIDocShellLoadInfo.idl
diff --git a/docshell/base/nsIDocShellTreeItem.idl b/system/docshell/base/nsIDocShellTreeItem.idl
index 431b16c79..431b16c79 100644
--- a/docshell/base/nsIDocShellTreeItem.idl
+++ b/system/docshell/base/nsIDocShellTreeItem.idl
diff --git a/docshell/base/nsIDocShellTreeOwner.idl b/system/docshell/base/nsIDocShellTreeOwner.idl
index 3610bd969..3610bd969 100644
--- a/docshell/base/nsIDocShellTreeOwner.idl
+++ b/system/docshell/base/nsIDocShellTreeOwner.idl
diff --git a/docshell/base/nsIDocumentLoaderFactory.idl b/system/docshell/base/nsIDocumentLoaderFactory.idl
index 7e0df1fd7..7e0df1fd7 100644
--- a/docshell/base/nsIDocumentLoaderFactory.idl
+++ b/system/docshell/base/nsIDocumentLoaderFactory.idl
diff --git a/docshell/base/nsIDownloadHistory.idl b/system/docshell/base/nsIDownloadHistory.idl
index ed2a19deb..ed2a19deb 100644
--- a/docshell/base/nsIDownloadHistory.idl
+++ b/system/docshell/base/nsIDownloadHistory.idl
diff --git a/docshell/base/nsIGlobalHistory2.idl b/system/docshell/base/nsIGlobalHistory2.idl
index aa8b44620..aa8b44620 100644
--- a/docshell/base/nsIGlobalHistory2.idl
+++ b/system/docshell/base/nsIGlobalHistory2.idl
diff --git a/docshell/base/nsILinkHandler.h b/system/docshell/base/nsILinkHandler.h
index c7e9db695..c7e9db695 100644
--- a/docshell/base/nsILinkHandler.h
+++ b/system/docshell/base/nsILinkHandler.h
diff --git a/docshell/base/nsILoadContext.idl b/system/docshell/base/nsILoadContext.idl
index b0da7597b..b0da7597b 100644
--- a/docshell/base/nsILoadContext.idl
+++ b/system/docshell/base/nsILoadContext.idl
diff --git a/docshell/base/nsIPrivacyTransitionObserver.idl b/system/docshell/base/nsIPrivacyTransitionObserver.idl
index c85d468d3..c85d468d3 100644
--- a/docshell/base/nsIPrivacyTransitionObserver.idl
+++ b/system/docshell/base/nsIPrivacyTransitionObserver.idl
diff --git a/docshell/base/nsIReflowObserver.idl b/system/docshell/base/nsIReflowObserver.idl
index fb602e260..fb602e260 100644
--- a/docshell/base/nsIReflowObserver.idl
+++ b/system/docshell/base/nsIReflowObserver.idl
diff --git a/docshell/base/nsIRefreshURI.idl b/system/docshell/base/nsIRefreshURI.idl
index 04f18eee0..04f18eee0 100644
--- a/docshell/base/nsIRefreshURI.idl
+++ b/system/docshell/base/nsIRefreshURI.idl
diff --git a/docshell/base/nsIScrollObserver.h b/system/docshell/base/nsIScrollObserver.h
index 3d5ca6a64..3d5ca6a64 100644
--- a/docshell/base/nsIScrollObserver.h
+++ b/system/docshell/base/nsIScrollObserver.h
diff --git a/docshell/base/nsIScrollable.idl b/system/docshell/base/nsIScrollable.idl
index c58554bfb..c58554bfb 100644
--- a/docshell/base/nsIScrollable.idl
+++ b/system/docshell/base/nsIScrollable.idl
diff --git a/docshell/base/nsITextScroll.idl b/system/docshell/base/nsITextScroll.idl
index 87338c491..87338c491 100644
--- a/docshell/base/nsITextScroll.idl
+++ b/system/docshell/base/nsITextScroll.idl
diff --git a/docshell/base/nsIURIFixup.idl b/system/docshell/base/nsIURIFixup.idl
index 0145aca00..0145aca00 100644
--- a/docshell/base/nsIURIFixup.idl
+++ b/system/docshell/base/nsIURIFixup.idl
diff --git a/docshell/base/nsIWebNavigation.idl b/system/docshell/base/nsIWebNavigation.idl
index c3e2fc550..c3e2fc550 100644
--- a/docshell/base/nsIWebNavigation.idl
+++ b/system/docshell/base/nsIWebNavigation.idl
diff --git a/docshell/base/nsIWebNavigationInfo.idl b/system/docshell/base/nsIWebNavigationInfo.idl
index cb6035650..cb6035650 100644
--- a/docshell/base/nsIWebNavigationInfo.idl
+++ b/system/docshell/base/nsIWebNavigationInfo.idl
diff --git a/docshell/base/nsIWebPageDescriptor.idl b/system/docshell/base/nsIWebPageDescriptor.idl
index 96db7f34a..96db7f34a 100644
--- a/docshell/base/nsIWebPageDescriptor.idl
+++ b/system/docshell/base/nsIWebPageDescriptor.idl
diff --git a/docshell/base/nsIWebShellServices.h b/system/docshell/base/nsIWebShellServices.h
index 570c50724..570c50724 100644
--- a/docshell/base/nsIWebShellServices.h
+++ b/system/docshell/base/nsIWebShellServices.h
diff --git a/docshell/base/nsWebNavigationInfo.cpp b/system/docshell/base/nsWebNavigationInfo.cpp
index 6b6ab6ee0..6b6ab6ee0 100644
--- a/docshell/base/nsWebNavigationInfo.cpp
+++ b/system/docshell/base/nsWebNavigationInfo.cpp
diff --git a/docshell/base/nsWebNavigationInfo.h b/system/docshell/base/nsWebNavigationInfo.h
index 97ac7b754..97ac7b754 100644
--- a/docshell/base/nsWebNavigationInfo.h
+++ b/system/docshell/base/nsWebNavigationInfo.h
diff --git a/docshell/base/timeline/AbstractTimelineMarker.cpp b/system/docshell/base/timeline/AbstractTimelineMarker.cpp
index 36148a22b..36148a22b 100644
--- a/docshell/base/timeline/AbstractTimelineMarker.cpp
+++ b/system/docshell/base/timeline/AbstractTimelineMarker.cpp
diff --git a/docshell/base/timeline/AbstractTimelineMarker.h b/system/docshell/base/timeline/AbstractTimelineMarker.h
index 67b5e3cf8..67b5e3cf8 100644
--- a/docshell/base/timeline/AbstractTimelineMarker.h
+++ b/system/docshell/base/timeline/AbstractTimelineMarker.h
diff --git a/docshell/base/timeline/AutoGlobalTimelineMarker.cpp b/system/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
index 5e894b970..5e894b970 100644
--- a/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
+++ b/system/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
diff --git a/docshell/base/timeline/AutoGlobalTimelineMarker.h b/system/docshell/base/timeline/AutoGlobalTimelineMarker.h
index 1fcec2952..1fcec2952 100644
--- a/docshell/base/timeline/AutoGlobalTimelineMarker.h
+++ b/system/docshell/base/timeline/AutoGlobalTimelineMarker.h
diff --git a/docshell/base/timeline/AutoTimelineMarker.cpp b/system/docshell/base/timeline/AutoTimelineMarker.cpp
index c96f63e37..c96f63e37 100644
--- a/docshell/base/timeline/AutoTimelineMarker.cpp
+++ b/system/docshell/base/timeline/AutoTimelineMarker.cpp
diff --git a/docshell/base/timeline/AutoTimelineMarker.h b/system/docshell/base/timeline/AutoTimelineMarker.h
index a36e2e946..a36e2e946 100644
--- a/docshell/base/timeline/AutoTimelineMarker.h
+++ b/system/docshell/base/timeline/AutoTimelineMarker.h
diff --git a/docshell/base/timeline/CompositeTimelineMarker.h b/system/docshell/base/timeline/CompositeTimelineMarker.h
index c9a6319e7..c9a6319e7 100644
--- a/docshell/base/timeline/CompositeTimelineMarker.h
+++ b/system/docshell/base/timeline/CompositeTimelineMarker.h
diff --git a/docshell/base/timeline/ConsoleTimelineMarker.h b/system/docshell/base/timeline/ConsoleTimelineMarker.h
index add74e72b..add74e72b 100644
--- a/docshell/base/timeline/ConsoleTimelineMarker.h
+++ b/system/docshell/base/timeline/ConsoleTimelineMarker.h
diff --git a/docshell/base/timeline/DocLoadingTimelineMarker.h b/system/docshell/base/timeline/DocLoadingTimelineMarker.h
index 4e1c09a46..4e1c09a46 100644
--- a/docshell/base/timeline/DocLoadingTimelineMarker.h
+++ b/system/docshell/base/timeline/DocLoadingTimelineMarker.h
diff --git a/docshell/base/timeline/EventTimelineMarker.h b/system/docshell/base/timeline/EventTimelineMarker.h
index 9649b6eb9..9649b6eb9 100644
--- a/docshell/base/timeline/EventTimelineMarker.h
+++ b/system/docshell/base/timeline/EventTimelineMarker.h
diff --git a/docshell/base/timeline/JavascriptTimelineMarker.h b/system/docshell/base/timeline/JavascriptTimelineMarker.h
index 392fa50a1..392fa50a1 100644
--- a/docshell/base/timeline/JavascriptTimelineMarker.h
+++ b/system/docshell/base/timeline/JavascriptTimelineMarker.h
diff --git a/docshell/base/timeline/LayerTimelineMarker.h b/system/docshell/base/timeline/LayerTimelineMarker.h
index c086730f1..c086730f1 100644
--- a/docshell/base/timeline/LayerTimelineMarker.h
+++ b/system/docshell/base/timeline/LayerTimelineMarker.h
diff --git a/docshell/base/timeline/MarkersStorage.cpp b/system/docshell/base/timeline/MarkersStorage.cpp
index c5cd47ba2..c5cd47ba2 100644
--- a/docshell/base/timeline/MarkersStorage.cpp
+++ b/system/docshell/base/timeline/MarkersStorage.cpp
diff --git a/docshell/base/timeline/MarkersStorage.h b/system/docshell/base/timeline/MarkersStorage.h
index df6234074..df6234074 100644
--- a/docshell/base/timeline/MarkersStorage.h
+++ b/system/docshell/base/timeline/MarkersStorage.h
diff --git a/docshell/base/timeline/MessagePortTimelineMarker.h b/system/docshell/base/timeline/MessagePortTimelineMarker.h
index 42aa8890f..42aa8890f 100644
--- a/docshell/base/timeline/MessagePortTimelineMarker.h
+++ b/system/docshell/base/timeline/MessagePortTimelineMarker.h
diff --git a/docshell/base/timeline/ObservedDocShell.cpp b/system/docshell/base/timeline/ObservedDocShell.cpp
index 19429ad43..19429ad43 100644
--- a/docshell/base/timeline/ObservedDocShell.cpp
+++ b/system/docshell/base/timeline/ObservedDocShell.cpp
diff --git a/docshell/base/timeline/ObservedDocShell.h b/system/docshell/base/timeline/ObservedDocShell.h
index 69df7d141..69df7d141 100644
--- a/docshell/base/timeline/ObservedDocShell.h
+++ b/system/docshell/base/timeline/ObservedDocShell.h
diff --git a/docshell/base/timeline/RestyleTimelineMarker.h b/system/docshell/base/timeline/RestyleTimelineMarker.h
index b8b288635..b8b288635 100644
--- a/docshell/base/timeline/RestyleTimelineMarker.h
+++ b/system/docshell/base/timeline/RestyleTimelineMarker.h
diff --git a/docshell/base/timeline/TimelineConsumers.cpp b/system/docshell/base/timeline/TimelineConsumers.cpp
index 92d589c5b..92d589c5b 100644
--- a/docshell/base/timeline/TimelineConsumers.cpp
+++ b/system/docshell/base/timeline/TimelineConsumers.cpp
diff --git a/docshell/base/timeline/TimelineConsumers.h b/system/docshell/base/timeline/TimelineConsumers.h
index fb7686553..fb7686553 100644
--- a/docshell/base/timeline/TimelineConsumers.h
+++ b/system/docshell/base/timeline/TimelineConsumers.h
diff --git a/docshell/base/timeline/TimelineMarker.cpp b/system/docshell/base/timeline/TimelineMarker.cpp
index cd87be588..cd87be588 100644
--- a/docshell/base/timeline/TimelineMarker.cpp
+++ b/system/docshell/base/timeline/TimelineMarker.cpp
diff --git a/docshell/base/timeline/TimelineMarker.h b/system/docshell/base/timeline/TimelineMarker.h
index 1ac169c2e..1ac169c2e 100644
--- a/docshell/base/timeline/TimelineMarker.h
+++ b/system/docshell/base/timeline/TimelineMarker.h
diff --git a/docshell/base/timeline/TimelineMarkerEnums.h b/system/docshell/base/timeline/TimelineMarkerEnums.h
index 05c3d8094..05c3d8094 100644
--- a/docshell/base/timeline/TimelineMarkerEnums.h
+++ b/system/docshell/base/timeline/TimelineMarkerEnums.h
diff --git a/docshell/base/timeline/TimestampTimelineMarker.h b/system/docshell/base/timeline/TimestampTimelineMarker.h
index 99ca59e8c..99ca59e8c 100644
--- a/docshell/base/timeline/TimestampTimelineMarker.h
+++ b/system/docshell/base/timeline/TimestampTimelineMarker.h
diff --git a/docshell/base/timeline/WorkerTimelineMarker.h b/system/docshell/base/timeline/WorkerTimelineMarker.h
index 42dc49b1f..42dc49b1f 100644
--- a/docshell/base/timeline/WorkerTimelineMarker.h
+++ b/system/docshell/base/timeline/WorkerTimelineMarker.h
diff --git a/docshell/base/timeline/moz.build b/system/docshell/base/timeline/moz.build
index 29a817d28..64ef259e0 100644
--- a/docshell/base/timeline/moz.build
+++ b/system/docshell/base/timeline/moz.build
@@ -36,6 +36,4 @@ SOURCES += [
 
 FINAL_LIBRARY = 'xul'
 
-LOCAL_INCLUDES += [
-    '/docshell/base'
-]
+LOCAL_INCLUDES += ['..']
diff --git a/docshell/base/timeline/readme.md b/system/docshell/base/timeline/readme.md
index 2af9ed3a2..2af9ed3a2 100644
--- a/docshell/base/timeline/readme.md
+++ b/system/docshell/base/timeline/readme.md
diff --git a/docshell/build/moz.build b/system/docshell/build/moz.build
index 36d186e0b..36d186e0b 100644
--- a/docshell/build/moz.build
+++ b/system/docshell/build/moz.build
diff --git a/docshell/build/nsDocShellCID.h b/system/docshell/build/nsDocShellCID.h
index 3be455e7b..3be455e7b 100644
--- a/docshell/build/nsDocShellCID.h
+++ b/system/docshell/build/nsDocShellCID.h
diff --git a/docshell/build/nsDocShellModule.cpp b/system/docshell/build/nsDocShellModule.cpp
index d8f17223c..d8f17223c 100644
--- a/docshell/build/nsDocShellModule.cpp
+++ b/system/docshell/build/nsDocShellModule.cpp
diff --git a/docshell/moz.build b/system/docshell/moz.build
index 54161e336..54161e336 100644
--- a/docshell/moz.build
+++ b/system/docshell/moz.build
diff --git a/docshell/prefetch/OfflineCacheUpdateChild.cpp b/system/docshell/prefetch/OfflineCacheUpdateChild.cpp
index 555508c37..555508c37 100644
--- a/docshell/prefetch/OfflineCacheUpdateChild.cpp
+++ b/system/docshell/prefetch/OfflineCacheUpdateChild.cpp
diff --git a/docshell/prefetch/OfflineCacheUpdateChild.h b/system/docshell/prefetch/OfflineCacheUpdateChild.h
index 89d1e6f1f..89d1e6f1f 100644
--- a/docshell/prefetch/OfflineCacheUpdateChild.h
+++ b/system/docshell/prefetch/OfflineCacheUpdateChild.h
diff --git a/docshell/prefetch/OfflineCacheUpdateGlue.cpp b/system/docshell/prefetch/OfflineCacheUpdateGlue.cpp
index 71ca986ff..71ca986ff 100644
--- a/docshell/prefetch/OfflineCacheUpdateGlue.cpp
+++ b/system/docshell/prefetch/OfflineCacheUpdateGlue.cpp
diff --git a/docshell/prefetch/OfflineCacheUpdateGlue.h b/system/docshell/prefetch/OfflineCacheUpdateGlue.h
index 92201ec82..92201ec82 100644
--- a/docshell/prefetch/OfflineCacheUpdateGlue.h
+++ b/system/docshell/prefetch/OfflineCacheUpdateGlue.h
diff --git a/docshell/prefetch/OfflineCacheUpdateParent.cpp b/system/docshell/prefetch/OfflineCacheUpdateParent.cpp
index 0381ec3f6..0381ec3f6 100644
--- a/docshell/prefetch/OfflineCacheUpdateParent.cpp
+++ b/system/docshell/prefetch/OfflineCacheUpdateParent.cpp
diff --git a/docshell/prefetch/OfflineCacheUpdateParent.h b/system/docshell/prefetch/OfflineCacheUpdateParent.h
index f6dbc1cb2..f6dbc1cb2 100644
--- a/docshell/prefetch/OfflineCacheUpdateParent.h
+++ b/system/docshell/prefetch/OfflineCacheUpdateParent.h
diff --git a/docshell/prefetch/POfflineCacheUpdate.ipdl b/system/docshell/prefetch/POfflineCacheUpdate.ipdl
index 7f1614d81..7f1614d81 100644
--- a/docshell/prefetch/POfflineCacheUpdate.ipdl
+++ b/system/docshell/prefetch/POfflineCacheUpdate.ipdl
diff --git a/docshell/prefetch/moz.build b/system/docshell/prefetch/moz.build
index d60197953..d60197953 100644
--- a/docshell/prefetch/moz.build
+++ b/system/docshell/prefetch/moz.build
diff --git a/docshell/prefetch/nsCPrefetchService.h b/system/docshell/prefetch/nsCPrefetchService.h
index d74d89fe7..d74d89fe7 100644
--- a/docshell/prefetch/nsCPrefetchService.h
+++ b/system/docshell/prefetch/nsCPrefetchService.h
diff --git a/docshell/prefetch/nsIOfflineCacheUpdate.idl b/system/docshell/prefetch/nsIOfflineCacheUpdate.idl
index 1308a8de2..1308a8de2 100644
--- a/docshell/prefetch/nsIOfflineCacheUpdate.idl
+++ b/system/docshell/prefetch/nsIOfflineCacheUpdate.idl
diff --git a/docshell/prefetch/nsIPrefetchService.idl b/system/docshell/prefetch/nsIPrefetchService.idl
index 198320dd2..198320dd2 100644
--- a/docshell/prefetch/nsIPrefetchService.idl
+++ b/system/docshell/prefetch/nsIPrefetchService.idl
diff --git a/docshell/prefetch/nsOfflineCacheUpdate.cpp b/system/docshell/prefetch/nsOfflineCacheUpdate.cpp
index 8a4183429..8a4183429 100644
--- a/docshell/prefetch/nsOfflineCacheUpdate.cpp
+++ b/system/docshell/prefetch/nsOfflineCacheUpdate.cpp
diff --git a/docshell/prefetch/nsOfflineCacheUpdate.h b/system/docshell/prefetch/nsOfflineCacheUpdate.h
index 2e6d6d30c..2e6d6d30c 100644
--- a/docshell/prefetch/nsOfflineCacheUpdate.h
+++ b/system/docshell/prefetch/nsOfflineCacheUpdate.h
diff --git a/docshell/prefetch/nsOfflineCacheUpdateService.cpp b/system/docshell/prefetch/nsOfflineCacheUpdateService.cpp
index 6a67af013..6a67af013 100644
--- a/docshell/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/system/docshell/prefetch/nsOfflineCacheUpdateService.cpp
diff --git a/docshell/prefetch/nsPrefetchService.cpp b/system/docshell/prefetch/nsPrefetchService.cpp
index bd2b10d30..bd2b10d30 100644
--- a/docshell/prefetch/nsPrefetchService.cpp
+++ b/system/docshell/prefetch/nsPrefetchService.cpp
diff --git a/docshell/prefetch/nsPrefetchService.h b/system/docshell/prefetch/nsPrefetchService.h
index 883449e68..883449e68 100644
--- a/docshell/prefetch/nsPrefetchService.h
+++ b/system/docshell/prefetch/nsPrefetchService.h
diff --git a/docshell/resources/content/jar.mn b/system/docshell/resources/content/jar.mn
index 49c26aaba..49c26aaba 100644
--- a/docshell/resources/content/jar.mn
+++ b/system/docshell/resources/content/jar.mn
diff --git a/docshell/resources/content/moz.build b/system/docshell/resources/content/moz.build
index 635fa39c9..635fa39c9 100644
--- a/docshell/resources/content/moz.build
+++ b/system/docshell/resources/content/moz.build
diff --git a/docshell/resources/content/netError.xhtml b/system/docshell/resources/content/netError.xhtml
index 1db7131d3..1db7131d3 100644
--- a/docshell/resources/content/netError.xhtml
+++ b/system/docshell/resources/content/netError.xhtml
diff --git a/docshell/shistory/moz.build b/system/docshell/shistory/moz.build
index 416f62227..f0a3bd397 100644
--- a/docshell/shistory/moz.build
+++ b/system/docshell/shistory/moz.build
@@ -29,9 +29,7 @@ SOURCES += [
     'nsSHTransaction.cpp',
 ]
 
-LOCAL_INCLUDES += [
-    '/docshell/base',
-]
+LOCAL_INCLUDES += ['../base']
 
 FINAL_LIBRARY = 'xul'
 
diff --git a/docshell/shistory/nsIBFCacheEntry.idl b/system/docshell/shistory/nsIBFCacheEntry.idl
index e16f1a302..e16f1a302 100644
--- a/docshell/shistory/nsIBFCacheEntry.idl
+++ b/system/docshell/shistory/nsIBFCacheEntry.idl
diff --git a/docshell/shistory/nsIGroupedSHistory.idl b/system/docshell/shistory/nsIGroupedSHistory.idl
index 4001dcc34..4001dcc34 100644
--- a/docshell/shistory/nsIGroupedSHistory.idl
+++ b/system/docshell/shistory/nsIGroupedSHistory.idl
diff --git a/docshell/shistory/nsIPartialSHistory.idl b/system/docshell/shistory/nsIPartialSHistory.idl
index 99359794e..99359794e 100644
--- a/docshell/shistory/nsIPartialSHistory.idl
+++ b/system/docshell/shistory/nsIPartialSHistory.idl
diff --git a/docshell/shistory/nsIPartialSHistoryListener.idl b/system/docshell/shistory/nsIPartialSHistoryListener.idl
index f0cdfd7e4..f0cdfd7e4 100644
--- a/docshell/shistory/nsIPartialSHistoryListener.idl
+++ b/system/docshell/shistory/nsIPartialSHistoryListener.idl
diff --git a/docshell/shistory/nsISHContainer.idl b/system/docshell/shistory/nsISHContainer.idl
index 942603d87..942603d87 100644
--- a/docshell/shistory/nsISHContainer.idl
+++ b/system/docshell/shistory/nsISHContainer.idl
diff --git a/docshell/shistory/nsISHEntry.idl b/system/docshell/shistory/nsISHEntry.idl
index 05dbf7642..05dbf7642 100644
--- a/docshell/shistory/nsISHEntry.idl
+++ b/system/docshell/shistory/nsISHEntry.idl
diff --git a/docshell/shistory/nsISHTransaction.idl b/system/docshell/shistory/nsISHTransaction.idl
index f5467cfb9..f5467cfb9 100644
--- a/docshell/shistory/nsISHTransaction.idl
+++ b/system/docshell/shistory/nsISHTransaction.idl
diff --git a/docshell/shistory/nsISHistory.idl b/system/docshell/shistory/nsISHistory.idl
index 71da2e1ab..71da2e1ab 100644
--- a/docshell/shistory/nsISHistory.idl
+++ b/system/docshell/shistory/nsISHistory.idl
diff --git a/docshell/shistory/nsISHistoryInternal.idl b/system/docshell/shistory/nsISHistoryInternal.idl
index b7b900547..b7b900547 100644
--- a/docshell/shistory/nsISHistoryInternal.idl
+++ b/system/docshell/shistory/nsISHistoryInternal.idl
diff --git a/docshell/shistory/nsISHistoryListener.idl b/system/docshell/shistory/nsISHistoryListener.idl
index 38552d60e..38552d60e 100644
--- a/docshell/shistory/nsISHistoryListener.idl
+++ b/system/docshell/shistory/nsISHistoryListener.idl
diff --git a/docshell/shistory/nsSHEntry.cpp b/system/docshell/shistory/nsSHEntry.cpp
index 174305be6..174305be6 100644
--- a/docshell/shistory/nsSHEntry.cpp
+++ b/system/docshell/shistory/nsSHEntry.cpp
diff --git a/docshell/shistory/nsSHEntry.h b/system/docshell/shistory/nsSHEntry.h
index 3afd7331d..3afd7331d 100644
--- a/docshell/shistory/nsSHEntry.h
+++ b/system/docshell/shistory/nsSHEntry.h
diff --git a/docshell/shistory/nsSHEntryShared.cpp b/system/docshell/shistory/nsSHEntryShared.cpp
index 364e5a607..364e5a607 100644
--- a/docshell/shistory/nsSHEntryShared.cpp
+++ b/system/docshell/shistory/nsSHEntryShared.cpp
diff --git a/docshell/shistory/nsSHEntryShared.h b/system/docshell/shistory/nsSHEntryShared.h
index 328f590a9..328f590a9 100644
--- a/docshell/shistory/nsSHEntryShared.h
+++ b/system/docshell/shistory/nsSHEntryShared.h
diff --git a/docshell/shistory/nsSHTransaction.cpp b/system/docshell/shistory/nsSHTransaction.cpp
index 5f9a6fd5b..5f9a6fd5b 100644
--- a/docshell/shistory/nsSHTransaction.cpp
+++ b/system/docshell/shistory/nsSHTransaction.cpp
diff --git a/docshell/shistory/nsSHTransaction.h b/system/docshell/shistory/nsSHTransaction.h
index 6ccf5a34e..6ccf5a34e 100644
--- a/docshell/shistory/nsSHTransaction.h
+++ b/system/docshell/shistory/nsSHTransaction.h
diff --git a/docshell/shistory/nsSHistory.cpp b/system/docshell/shistory/nsSHistory.cpp
index 949285765..949285765 100644
--- a/docshell/shistory/nsSHistory.cpp
+++ b/system/docshell/shistory/nsSHistory.cpp
diff --git a/docshell/shistory/nsSHistory.h b/system/docshell/shistory/nsSHistory.h
index 23d797ab8..23d797ab8 100644
--- a/docshell/shistory/nsSHistory.h
+++ b/system/docshell/shistory/nsSHistory.h
diff --git a/docshell/test/browser/browser.ini b/system/docshell/test/browser/browser.ini
index 300caff1a..300caff1a 100644
--- a/docshell/test/browser/browser.ini
+++ b/system/docshell/test/browser/browser.ini
diff --git a/docshell/test/browser/browser_bug1206879.js b/system/docshell/test/browser/browser_bug1206879.js
index 1276f6428..1276f6428 100644
--- a/docshell/test/browser/browser_bug1206879.js
+++ b/system/docshell/test/browser/browser_bug1206879.js
diff --git a/docshell/test/browser/browser_bug1309900_crossProcessHistoryNavigation.js b/system/docshell/test/browser/browser_bug1309900_crossProcessHistoryNavigation.js
index 55de27def..55de27def 100644
--- a/docshell/test/browser/browser_bug1309900_crossProcessHistoryNavigation.js
+++ b/system/docshell/test/browser/browser_bug1309900_crossProcessHistoryNavigation.js
diff --git a/docshell/test/browser/browser_bug134911.js b/system/docshell/test/browser/browser_bug134911.js
index aa54cfd1a..aa54cfd1a 100644
--- a/docshell/test/browser/browser_bug134911.js
+++ b/system/docshell/test/browser/browser_bug134911.js
diff --git a/docshell/test/browser/browser_bug234628-1.js b/system/docshell/test/browser/browser_bug234628-1.js
index bfb4d3708..bfb4d3708 100644
--- a/docshell/test/browser/browser_bug234628-1.js
+++ b/system/docshell/test/browser/browser_bug234628-1.js
diff --git a/docshell/test/browser/browser_bug234628-10.js b/system/docshell/test/browser/browser_bug234628-10.js
index 7dbe805c4..7dbe805c4 100644
--- a/docshell/test/browser/browser_bug234628-10.js
+++ b/system/docshell/test/browser/browser_bug234628-10.js
diff --git a/docshell/test/browser/browser_bug234628-11.js b/system/docshell/test/browser/browser_bug234628-11.js
index fc597f5c0..fc597f5c0 100644
--- a/docshell/test/browser/browser_bug234628-11.js
+++ b/system/docshell/test/browser/browser_bug234628-11.js
diff --git a/docshell/test/browser/browser_bug234628-2.js b/system/docshell/test/browser/browser_bug234628-2.js
index 638e223c0..638e223c0 100644
--- a/docshell/test/browser/browser_bug234628-2.js
+++ b/system/docshell/test/browser/browser_bug234628-2.js
diff --git a/docshell/test/browser/browser_bug234628-3.js b/system/docshell/test/browser/browser_bug234628-3.js
index 51aca7ec8..51aca7ec8 100644
--- a/docshell/test/browser/browser_bug234628-3.js
+++ b/system/docshell/test/browser/browser_bug234628-3.js
diff --git a/docshell/test/browser/browser_bug234628-4.js b/system/docshell/test/browser/browser_bug234628-4.js
index fe7f1545f..fe7f1545f 100644
--- a/docshell/test/browser/browser_bug234628-4.js
+++ b/system/docshell/test/browser/browser_bug234628-4.js
diff --git a/docshell/test/browser/browser_bug234628-5.js b/system/docshell/test/browser/browser_bug234628-5.js
index a37f14b8d..a37f14b8d 100644
--- a/docshell/test/browser/browser_bug234628-5.js
+++ b/system/docshell/test/browser/browser_bug234628-5.js
diff --git a/docshell/test/browser/browser_bug234628-6.js b/system/docshell/test/browser/browser_bug234628-6.js
index 7d2d92531..7d2d92531 100644
--- a/docshell/test/browser/browser_bug234628-6.js
+++ b/system/docshell/test/browser/browser_bug234628-6.js
diff --git a/docshell/test/browser/browser_bug234628-7.js b/system/docshell/test/browser/browser_bug234628-7.js
index 0bafd67e7..0bafd67e7 100644
--- a/docshell/test/browser/browser_bug234628-7.js
+++ b/system/docshell/test/browser/browser_bug234628-7.js
diff --git a/docshell/test/browser/browser_bug234628-8.js b/system/docshell/test/browser/browser_bug234628-8.js
index 40a0c6946..40a0c6946 100644
--- a/docshell/test/browser/browser_bug234628-8.js
+++ b/system/docshell/test/browser/browser_bug234628-8.js
diff --git a/docshell/test/browser/browser_bug234628-9.js b/system/docshell/test/browser/browser_bug234628-9.js
index 72da65e80..72da65e80 100644
--- a/docshell/test/browser/browser_bug234628-9.js
+++ b/system/docshell/test/browser/browser_bug234628-9.js
diff --git a/docshell/test/browser/browser_bug349769.js b/system/docshell/test/browser/browser_bug349769.js
index 76d4e0f28..76d4e0f28 100644
--- a/docshell/test/browser/browser_bug349769.js
+++ b/system/docshell/test/browser/browser_bug349769.js
diff --git a/docshell/test/browser/browser_bug388121-1.js b/system/docshell/test/browser/browser_bug388121-1.js
index 7da617594..7da617594 100644
--- a/docshell/test/browser/browser_bug388121-1.js
+++ b/system/docshell/test/browser/browser_bug388121-1.js
diff --git a/docshell/test/browser/browser_bug388121-2.js b/system/docshell/test/browser/browser_bug388121-2.js
index 6c050d971..6c050d971 100644
--- a/docshell/test/browser/browser_bug388121-2.js
+++ b/system/docshell/test/browser/browser_bug388121-2.js
diff --git a/docshell/test/browser/browser_bug420605.js b/system/docshell/test/browser/browser_bug420605.js
index f07d45e93..f07d45e93 100644
--- a/docshell/test/browser/browser_bug420605.js
+++ b/system/docshell/test/browser/browser_bug420605.js
diff --git a/docshell/test/browser/browser_bug422543.js b/system/docshell/test/browser/browser_bug422543.js
index 0655a17b7..0655a17b7 100644
--- a/docshell/test/browser/browser_bug422543.js
+++ b/system/docshell/test/browser/browser_bug422543.js
diff --git a/docshell/test/browser/browser_bug441169.js b/system/docshell/test/browser/browser_bug441169.js
index 015115793..015115793 100644
--- a/docshell/test/browser/browser_bug441169.js
+++ b/system/docshell/test/browser/browser_bug441169.js
diff --git a/docshell/test/browser/browser_bug503832.js b/system/docshell/test/browser/browser_bug503832.js
index 66904cbae..66904cbae 100644
--- a/docshell/test/browser/browser_bug503832.js
+++ b/system/docshell/test/browser/browser_bug503832.js
diff --git a/docshell/test/browser/browser_bug554155.js b/system/docshell/test/browser/browser_bug554155.js
index efc74a1c1..efc74a1c1 100644
--- a/docshell/test/browser/browser_bug554155.js
+++ b/system/docshell/test/browser/browser_bug554155.js
diff --git a/docshell/test/browser/browser_bug655270.js b/system/docshell/test/browser/browser_bug655270.js
index 275245df8..275245df8 100644
--- a/docshell/test/browser/browser_bug655270.js
+++ b/system/docshell/test/browser/browser_bug655270.js
diff --git a/docshell/test/browser/browser_bug655273.js b/system/docshell/test/browser/browser_bug655273.js
index 3acb6ddd5..3acb6ddd5 100644
--- a/docshell/test/browser/browser_bug655273.js
+++ b/system/docshell/test/browser/browser_bug655273.js
diff --git a/docshell/test/browser/browser_bug670318.js b/system/docshell/test/browser/browser_bug670318.js
index a73639cab..a73639cab 100644
--- a/docshell/test/browser/browser_bug670318.js
+++ b/system/docshell/test/browser/browser_bug670318.js
diff --git a/docshell/test/browser/browser_bug673467.js b/system/docshell/test/browser/browser_bug673467.js
index 10139a48c..10139a48c 100644
--- a/docshell/test/browser/browser_bug673467.js
+++ b/system/docshell/test/browser/browser_bug673467.js
diff --git a/docshell/test/browser/browser_bug852909.js b/system/docshell/test/browser/browser_bug852909.js
index 5e2374c43..5e2374c43 100644
--- a/docshell/test/browser/browser_bug852909.js
+++ b/system/docshell/test/browser/browser_bug852909.js
diff --git a/docshell/test/browser/browser_bug92473.js b/system/docshell/test/browser/browser_bug92473.js
index d1c4aebdb..d1c4aebdb 100644
--- a/docshell/test/browser/browser_bug92473.js
+++ b/system/docshell/test/browser/browser_bug92473.js
diff --git a/docshell/test/browser/browser_click_link_within_view_source.js b/system/docshell/test/browser/browser_click_link_within_view_source.js
index 84cfc1f0f..84cfc1f0f 100644
--- a/docshell/test/browser/browser_click_link_within_view_source.js
+++ b/system/docshell/test/browser/browser_click_link_within_view_source.js
diff --git a/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js b/system/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js
index 96908bbc2..96908bbc2 100644
--- a/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js
+++ b/system/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js
diff --git a/docshell/test/browser/browser_loadDisallowInherit.js b/system/docshell/test/browser/browser_loadDisallowInherit.js
index 71789890f..71789890f 100644
--- a/docshell/test/browser/browser_loadDisallowInherit.js
+++ b/system/docshell/test/browser/browser_loadDisallowInherit.js
diff --git a/docshell/test/browser/browser_loadURI.js b/system/docshell/test/browser/browser_loadURI.js
index a68e1c2de..a68e1c2de 100644
--- a/docshell/test/browser/browser_loadURI.js
+++ b/system/docshell/test/browser/browser_loadURI.js
diff --git a/docshell/test/browser/browser_multiple_pushState.js b/system/docshell/test/browser/browser_multiple_pushState.js
index 5c2f5aef4..5c2f5aef4 100644
--- a/docshell/test/browser/browser_multiple_pushState.js
+++ b/system/docshell/test/browser/browser_multiple_pushState.js
diff --git a/docshell/test/browser/browser_onbeforeunload_navigation.js b/system/docshell/test/browser/browser_onbeforeunload_navigation.js
index d2feb69d4..d2feb69d4 100644
--- a/docshell/test/browser/browser_onbeforeunload_navigation.js
+++ b/system/docshell/test/browser/browser_onbeforeunload_navigation.js
diff --git a/docshell/test/browser/browser_search_notification.js b/system/docshell/test/browser/browser_search_notification.js
index b0a4571e5..b0a4571e5 100644
--- a/docshell/test/browser/browser_search_notification.js
+++ b/system/docshell/test/browser/browser_search_notification.js
diff --git a/docshell/test/browser/browser_tab_touch_events.js b/system/docshell/test/browser/browser_tab_touch_events.js
index 615983f61..615983f61 100644
--- a/docshell/test/browser/browser_tab_touch_events.js
+++ b/system/docshell/test/browser/browser_tab_touch_events.js
diff --git a/docshell/test/browser/browser_timelineMarkers-01.js b/system/docshell/test/browser/browser_timelineMarkers-01.js
index 59eeb57db..59eeb57db 100644
--- a/docshell/test/browser/browser_timelineMarkers-01.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-01.js
diff --git a/docshell/test/browser/browser_timelineMarkers-02.js b/system/docshell/test/browser/browser_timelineMarkers-02.js
index 34142760e..34142760e 100644
--- a/docshell/test/browser/browser_timelineMarkers-02.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-02.js
diff --git a/docshell/test/browser/browser_timelineMarkers-03.js b/system/docshell/test/browser/browser_timelineMarkers-03.js
index b104367c1..b104367c1 100644
--- a/docshell/test/browser/browser_timelineMarkers-03.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-03.js
diff --git a/docshell/test/browser/browser_timelineMarkers-04.js b/system/docshell/test/browser/browser_timelineMarkers-04.js
index fdee867e7..fdee867e7 100644
--- a/docshell/test/browser/browser_timelineMarkers-04.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-04.js
diff --git a/docshell/test/browser/browser_timelineMarkers-05.js b/system/docshell/test/browser/browser_timelineMarkers-05.js
index 0130c58d9..0130c58d9 100644
--- a/docshell/test/browser/browser_timelineMarkers-05.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-05.js
diff --git a/docshell/test/browser/browser_timelineMarkers-frame-02.js b/system/docshell/test/browser/browser_timelineMarkers-frame-02.js
index 83750395d..83750395d 100644
--- a/docshell/test/browser/browser_timelineMarkers-frame-02.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-frame-02.js
diff --git a/docshell/test/browser/browser_timelineMarkers-frame-03.js b/system/docshell/test/browser/browser_timelineMarkers-frame-03.js
index cf5f150ad..cf5f150ad 100644
--- a/docshell/test/browser/browser_timelineMarkers-frame-03.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-frame-03.js
diff --git a/docshell/test/browser/browser_timelineMarkers-frame-04.js b/system/docshell/test/browser/browser_timelineMarkers-frame-04.js
index 427312993..427312993 100644
--- a/docshell/test/browser/browser_timelineMarkers-frame-04.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-frame-04.js
diff --git a/docshell/test/browser/browser_timelineMarkers-frame-05.js b/system/docshell/test/browser/browser_timelineMarkers-frame-05.js
index 713f0e560..713f0e560 100644
--- a/docshell/test/browser/browser_timelineMarkers-frame-05.js
+++ b/system/docshell/test/browser/browser_timelineMarkers-frame-05.js
diff --git a/docshell/test/browser/browser_ua_emulation.js b/system/docshell/test/browser/browser_ua_emulation.js
index 94a602d4b..94a602d4b 100644
--- a/docshell/test/browser/browser_ua_emulation.js
+++ b/system/docshell/test/browser/browser_ua_emulation.js
diff --git a/docshell/test/browser/browser_uriFixupAlternateRedirects.js b/system/docshell/test/browser/browser_uriFixupAlternateRedirects.js
index f5a00a2df..f5a00a2df 100644
--- a/docshell/test/browser/browser_uriFixupAlternateRedirects.js
+++ b/system/docshell/test/browser/browser_uriFixupAlternateRedirects.js
diff --git a/docshell/test/browser/browser_uriFixupIntegration.js b/system/docshell/test/browser/browser_uriFixupIntegration.js
index e041e1f67..e041e1f67 100644
--- a/docshell/test/browser/browser_uriFixupIntegration.js
+++ b/system/docshell/test/browser/browser_uriFixupIntegration.js
diff --git a/docshell/test/browser/dummy_page.html b/system/docshell/test/browser/dummy_page.html
index 59bf2a5f8..59bf2a5f8 100644
--- a/docshell/test/browser/dummy_page.html
+++ b/system/docshell/test/browser/dummy_page.html
diff --git a/docshell/test/browser/favicon_bug655270.ico b/system/docshell/test/browser/favicon_bug655270.ico
index d44438903..d44438903 100644
--- a/docshell/test/browser/favicon_bug655270.ico
+++ b/system/docshell/test/browser/favicon_bug655270.ico
diff --git a/docshell/test/browser/file_bug1046022.html b/system/docshell/test/browser/file_bug1046022.html
index 2de68cb43..2de68cb43 100644
--- a/docshell/test/browser/file_bug1046022.html
+++ b/system/docshell/test/browser/file_bug1046022.html
diff --git a/docshell/test/browser/file_bug1206879.html b/system/docshell/test/browser/file_bug1206879.html
index 5313902a9..5313902a9 100644
--- a/docshell/test/browser/file_bug1206879.html
+++ b/system/docshell/test/browser/file_bug1206879.html
diff --git a/docshell/test/browser/file_bug234628-1-child.html b/system/docshell/test/browser/file_bug234628-1-child.html
index c36197ac4..c36197ac4 100644
--- a/docshell/test/browser/file_bug234628-1-child.html
+++ b/system/docshell/test/browser/file_bug234628-1-child.html
diff --git a/docshell/test/browser/file_bug234628-1.html b/system/docshell/test/browser/file_bug234628-1.html
index 11c523ccd..11c523ccd 100644
--- a/docshell/test/browser/file_bug234628-1.html
+++ b/system/docshell/test/browser/file_bug234628-1.html
diff --git a/docshell/test/browser/file_bug234628-10-child.xhtml b/system/docshell/test/browser/file_bug234628-10-child.xhtml
index cccf6f2bc..cccf6f2bc 100644
--- a/docshell/test/browser/file_bug234628-10-child.xhtml
+++ b/system/docshell/test/browser/file_bug234628-10-child.xhtml
diff --git a/docshell/test/browser/file_bug234628-10.html b/system/docshell/test/browser/file_bug234628-10.html
index 78b8f0035..78b8f0035 100644
--- a/docshell/test/browser/file_bug234628-10.html
+++ b/system/docshell/test/browser/file_bug234628-10.html
diff --git a/docshell/test/browser/file_bug234628-11-child.xhtml b/system/docshell/test/browser/file_bug234628-11-child.xhtml
index 11ef668b0..11ef668b0 100644
--- a/docshell/test/browser/file_bug234628-11-child.xhtml
+++ b/system/docshell/test/browser/file_bug234628-11-child.xhtml
diff --git a/docshell/test/browser/file_bug234628-11-child.xhtml^headers^ b/system/docshell/test/browser/file_bug234628-11-child.xhtml^headers^
index 30fb30405..30fb30405 100644
--- a/docshell/test/browser/file_bug234628-11-child.xhtml^headers^
+++ b/system/docshell/test/browser/file_bug234628-11-child.xhtml^headers^
diff --git a/docshell/test/browser/file_bug234628-11.html b/system/docshell/test/browser/file_bug234628-11.html
index 21c5b733e..21c5b733e 100644
--- a/docshell/test/browser/file_bug234628-11.html
+++ b/system/docshell/test/browser/file_bug234628-11.html
diff --git a/docshell/test/browser/file_bug234628-2-child.html b/system/docshell/test/browser/file_bug234628-2-child.html
index 0acd2e0b2..0acd2e0b2 100644
--- a/docshell/test/browser/file_bug234628-2-child.html
+++ b/system/docshell/test/browser/file_bug234628-2-child.html
diff --git a/docshell/test/browser/file_bug234628-2.html b/system/docshell/test/browser/file_bug234628-2.html
index a87d29e12..a87d29e12 100644
--- a/docshell/test/browser/file_bug234628-2.html
+++ b/system/docshell/test/browser/file_bug234628-2.html
diff --git a/docshell/test/browser/file_bug234628-3-child.html b/system/docshell/test/browser/file_bug234628-3-child.html
index a6ad83231..a6ad83231 100644
--- a/docshell/test/browser/file_bug234628-3-child.html
+++ b/system/docshell/test/browser/file_bug234628-3-child.html
diff --git a/docshell/test/browser/file_bug234628-3.html b/system/docshell/test/browser/file_bug234628-3.html
index 8caab6040..8caab6040 100644
--- a/docshell/test/browser/file_bug234628-3.html
+++ b/system/docshell/test/browser/file_bug234628-3.html
diff --git a/docshell/test/browser/file_bug234628-4-child.html b/system/docshell/test/browser/file_bug234628-4-child.html
index f0e7c2c05..f0e7c2c05 100644
--- a/docshell/test/browser/file_bug234628-4-child.html
+++ b/system/docshell/test/browser/file_bug234628-4-child.html
diff --git a/docshell/test/browser/file_bug234628-4.html b/system/docshell/test/browser/file_bug234628-4.html
index 013757901..013757901 100644
--- a/docshell/test/browser/file_bug234628-4.html
+++ b/system/docshell/test/browser/file_bug234628-4.html
diff --git a/docshell/test/browser/file_bug234628-5-child.html b/system/docshell/test/browser/file_bug234628-5-child.html
index a650552f6..a650552f6 100644
--- a/docshell/test/browser/file_bug234628-5-child.html
+++ b/system/docshell/test/browser/file_bug234628-5-child.html
diff --git a/docshell/test/browser/file_bug234628-5.html b/system/docshell/test/browser/file_bug234628-5.html
index 987e6420b..987e6420b 100644
--- a/docshell/test/browser/file_bug234628-5.html
+++ b/system/docshell/test/browser/file_bug234628-5.html
diff --git a/docshell/test/browser/file_bug234628-6-child.html b/system/docshell/test/browser/file_bug234628-6-child.html
index 52c37f259..52c37f259 100644
--- a/docshell/test/browser/file_bug234628-6-child.html
+++ b/system/docshell/test/browser/file_bug234628-6-child.html
diff --git a/docshell/test/browser/file_bug234628-6-child.html^headers^ b/system/docshell/test/browser/file_bug234628-6-child.html^headers^
index bfdcf487f..bfdcf487f 100644
--- a/docshell/test/browser/file_bug234628-6-child.html^headers^
+++ b/system/docshell/test/browser/file_bug234628-6-child.html^headers^
diff --git a/docshell/test/browser/file_bug234628-6.html b/system/docshell/test/browser/file_bug234628-6.html
index 9d7fc580c..9d7fc580c 100644
--- a/docshell/test/browser/file_bug234628-6.html
+++ b/system/docshell/test/browser/file_bug234628-6.html
diff --git a/docshell/test/browser/file_bug234628-7-child.html b/system/docshell/test/browser/file_bug234628-7-child.html
index c761ace10..c761ace10 100644
--- a/docshell/test/browser/file_bug234628-7-child.html
+++ b/system/docshell/test/browser/file_bug234628-7-child.html
diff --git a/docshell/test/browser/file_bug234628-7-child.html^headers^ b/system/docshell/test/browser/file_bug234628-7-child.html^headers^
index 2d1c08b9e..2d1c08b9e 100644
--- a/docshell/test/browser/file_bug234628-7-child.html^headers^
+++ b/system/docshell/test/browser/file_bug234628-7-child.html^headers^
diff --git a/docshell/test/browser/file_bug234628-7.html b/system/docshell/test/browser/file_bug234628-7.html
index 7cb506096..7cb506096 100644
--- a/docshell/test/browser/file_bug234628-7.html
+++ b/system/docshell/test/browser/file_bug234628-7.html
diff --git a/docshell/test/browser/file_bug234628-8-child.html b/system/docshell/test/browser/file_bug234628-8-child.html
index 254e0fb2b..254e0fb2b 100644
--- a/docshell/test/browser/file_bug234628-8-child.html
+++ b/system/docshell/test/browser/file_bug234628-8-child.html
diff --git a/docshell/test/browser/file_bug234628-8.html b/system/docshell/test/browser/file_bug234628-8.html
index b44e91801..b44e91801 100644
--- a/docshell/test/browser/file_bug234628-8.html
+++ b/system/docshell/test/browser/file_bug234628-8.html
diff --git a/docshell/test/browser/file_bug234628-9-child.html b/system/docshell/test/browser/file_bug234628-9-child.html
index a86b14d7e..a86b14d7e 100644
--- a/docshell/test/browser/file_bug234628-9-child.html
+++ b/system/docshell/test/browser/file_bug234628-9-child.html
diff --git a/docshell/test/browser/file_bug234628-9.html b/system/docshell/test/browser/file_bug234628-9.html
index 8a469da3a..8a469da3a 100644
--- a/docshell/test/browser/file_bug234628-9.html
+++ b/system/docshell/test/browser/file_bug234628-9.html
diff --git a/docshell/test/browser/file_bug420605.html b/system/docshell/test/browser/file_bug420605.html
index 8424b92f8..8424b92f8 100644
--- a/docshell/test/browser/file_bug420605.html
+++ b/system/docshell/test/browser/file_bug420605.html
diff --git a/docshell/test/browser/file_bug422543_script.js b/system/docshell/test/browser/file_bug422543_script.js
index cd69df1ec..cd69df1ec 100644
--- a/docshell/test/browser/file_bug422543_script.js
+++ b/system/docshell/test/browser/file_bug422543_script.js
diff --git a/docshell/test/browser/file_bug503832.html b/system/docshell/test/browser/file_bug503832.html
index 338631c8a..338631c8a 100644
--- a/docshell/test/browser/file_bug503832.html
+++ b/system/docshell/test/browser/file_bug503832.html
diff --git a/docshell/test/browser/file_bug655270.html b/system/docshell/test/browser/file_bug655270.html
index 0c08d982b..0c08d982b 100644
--- a/docshell/test/browser/file_bug655270.html
+++ b/system/docshell/test/browser/file_bug655270.html
diff --git a/docshell/test/browser/file_bug670318.html b/system/docshell/test/browser/file_bug670318.html
index 4cd9b454a..4cd9b454a 100644
--- a/docshell/test/browser/file_bug670318.html
+++ b/system/docshell/test/browser/file_bug670318.html
diff --git a/docshell/test/browser/file_bug852909.pdf b/system/docshell/test/browser/file_bug852909.pdf
index 89066463f..89066463f 100644
--- a/docshell/test/browser/file_bug852909.pdf
+++ b/system/docshell/test/browser/file_bug852909.pdf
diff --git a/docshell/test/browser/file_bug852909.png b/system/docshell/test/browser/file_bug852909.png
index c7510d388..c7510d388 100644
--- a/docshell/test/browser/file_bug852909.png
+++ b/system/docshell/test/browser/file_bug852909.png
diff --git a/docshell/test/browser/file_click_link_within_view_source.html b/system/docshell/test/browser/file_click_link_within_view_source.html
index d78e4ba0f..d78e4ba0f 100644
--- a/docshell/test/browser/file_click_link_within_view_source.html
+++ b/system/docshell/test/browser/file_click_link_within_view_source.html
diff --git a/docshell/test/browser/file_multiple_pushState.html b/system/docshell/test/browser/file_multiple_pushState.html
index c58a1a71b..c58a1a71b 100644
--- a/docshell/test/browser/file_multiple_pushState.html
+++ b/system/docshell/test/browser/file_multiple_pushState.html
diff --git a/docshell/test/browser/frame-head.js b/system/docshell/test/browser/frame-head.js
index 5cb3b1513..5cb3b1513 100644
--- a/docshell/test/browser/frame-head.js
+++ b/system/docshell/test/browser/frame-head.js
diff --git a/docshell/test/browser/head.js b/system/docshell/test/browser/head.js
index 24ca8f45b..24ca8f45b 100644
--- a/docshell/test/browser/head.js
+++ b/system/docshell/test/browser/head.js
diff --git a/docshell/test/browser/print_postdata.sjs b/system/docshell/test/browser/print_postdata.sjs
index 4175a2480..4175a2480 100644
--- a/docshell/test/browser/print_postdata.sjs
+++ b/system/docshell/test/browser/print_postdata.sjs
diff --git a/docshell/test/browser/redirect_to_example.sjs b/system/docshell/test/browser/redirect_to_example.sjs
index eef5e49f4..eef5e49f4 100644
--- a/docshell/test/browser/redirect_to_example.sjs
+++ b/system/docshell/test/browser/redirect_to_example.sjs
diff --git a/docshell/test/browser/test-form_sjis.html b/system/docshell/test/browser/test-form_sjis.html
index 91c375dee..91c375dee 100644
--- a/docshell/test/browser/test-form_sjis.html
+++ b/system/docshell/test/browser/test-form_sjis.html
diff --git a/docshell/test/browser/timelineMarkers-04.html b/system/docshell/test/browser/timelineMarkers-04.html
index 829998387..829998387 100644
--- a/docshell/test/browser/timelineMarkers-04.html
+++ b/system/docshell/test/browser/timelineMarkers-04.html
diff --git a/docshell/test/bug123696-subframe.html b/system/docshell/test/bug123696-subframe.html
index 136d0a184..136d0a184 100644
--- a/docshell/test/bug123696-subframe.html
+++ b/system/docshell/test/bug123696-subframe.html
diff --git a/docshell/test/bug369814.jar b/system/docshell/test/bug369814.jar
index 86b9c8c09..86b9c8c09 100644
--- a/docshell/test/bug369814.jar
+++ b/system/docshell/test/bug369814.jar
diff --git a/docshell/test/bug369814.zip b/system/docshell/test/bug369814.zip
index ed8234dbc..ed8234dbc 100644
--- a/docshell/test/bug369814.zip
+++ b/system/docshell/test/bug369814.zip
diff --git a/docshell/test/bug404548-subframe.html b/system/docshell/test/bug404548-subframe.html
index 0afd17544..0afd17544 100644
--- a/docshell/test/bug404548-subframe.html
+++ b/system/docshell/test/bug404548-subframe.html
diff --git a/docshell/test/bug413310-post.sjs b/system/docshell/test/bug413310-post.sjs
index b8d85dd3c..b8d85dd3c 100644
--- a/docshell/test/bug413310-post.sjs
+++ b/system/docshell/test/bug413310-post.sjs
diff --git a/docshell/test/bug413310-subframe.html b/system/docshell/test/bug413310-subframe.html
index bcff1886f..bcff1886f 100644
--- a/docshell/test/bug413310-subframe.html
+++ b/system/docshell/test/bug413310-subframe.html
diff --git a/docshell/test/bug529119-window.html b/system/docshell/test/bug529119-window.html
index f1908835a..f1908835a 100644
--- a/docshell/test/bug529119-window.html
+++ b/system/docshell/test/bug529119-window.html
diff --git a/docshell/test/bug530396-noref.sjs b/system/docshell/test/bug530396-noref.sjs
index 1ed5f7aa2..1ed5f7aa2 100644
--- a/docshell/test/bug530396-noref.sjs
+++ b/system/docshell/test/bug530396-noref.sjs
diff --git a/docshell/test/bug530396-subframe.html b/system/docshell/test/bug530396-subframe.html
index be81b9f14..be81b9f14 100644
--- a/docshell/test/bug530396-subframe.html
+++ b/system/docshell/test/bug530396-subframe.html
diff --git a/docshell/test/bug570341_recordevents.html b/system/docshell/test/bug570341_recordevents.html
index 51fc1cd76..51fc1cd76 100644
--- a/docshell/test/bug570341_recordevents.html
+++ b/system/docshell/test/bug570341_recordevents.html
diff --git a/docshell/test/bug668513_redirect.html b/system/docshell/test/bug668513_redirect.html
index 1b8f66c63..1b8f66c63 100644
--- a/docshell/test/bug668513_redirect.html
+++ b/system/docshell/test/bug668513_redirect.html
diff --git a/docshell/test/bug668513_redirect.html^headers^ b/system/docshell/test/bug668513_redirect.html^headers^
index 0e785833c..0e785833c 100644
--- a/docshell/test/bug668513_redirect.html^headers^
+++ b/system/docshell/test/bug668513_redirect.html^headers^
diff --git a/docshell/test/bug691547_frame.html b/system/docshell/test/bug691547_frame.html
index 00172f711..00172f711 100644
--- a/docshell/test/bug691547_frame.html
+++ b/system/docshell/test/bug691547_frame.html
diff --git a/docshell/test/chrome/112564_nocache.html b/system/docshell/test/chrome/112564_nocache.html
index 29fb990b8..29fb990b8 100644
--- a/docshell/test/chrome/112564_nocache.html
+++ b/system/docshell/test/chrome/112564_nocache.html
diff --git a/docshell/test/chrome/112564_nocache.html^headers^ b/system/docshell/test/chrome/112564_nocache.html^headers^
index c829a41ae..c829a41ae 100644
--- a/docshell/test/chrome/112564_nocache.html^headers^
+++ b/system/docshell/test/chrome/112564_nocache.html^headers^
diff --git a/docshell/test/chrome/215405_nocache.html b/system/docshell/test/chrome/215405_nocache.html
index c7d48c4eb..c7d48c4eb 100644
--- a/docshell/test/chrome/215405_nocache.html
+++ b/system/docshell/test/chrome/215405_nocache.html
diff --git a/docshell/test/chrome/215405_nocache.html^headers^ b/system/docshell/test/chrome/215405_nocache.html^headers^
index c829a41ae..c829a41ae 100644
--- a/docshell/test/chrome/215405_nocache.html^headers^
+++ b/system/docshell/test/chrome/215405_nocache.html^headers^
diff --git a/docshell/test/chrome/215405_nostore.html b/system/docshell/test/chrome/215405_nostore.html
index 4f5bd0f4f..4f5bd0f4f 100644
--- a/docshell/test/chrome/215405_nostore.html
+++ b/system/docshell/test/chrome/215405_nostore.html
diff --git a/docshell/test/chrome/215405_nostore.html^headers^ b/system/docshell/test/chrome/215405_nostore.html^headers^
index 59ba29610..59ba29610 100644
--- a/docshell/test/chrome/215405_nostore.html^headers^
+++ b/system/docshell/test/chrome/215405_nostore.html^headers^
diff --git a/docshell/test/chrome/582176_dummy.html b/system/docshell/test/chrome/582176_dummy.html
index 3b18e512d..3b18e512d 100644
--- a/docshell/test/chrome/582176_dummy.html
+++ b/system/docshell/test/chrome/582176_dummy.html
diff --git a/docshell/test/chrome/582176_xml.xml b/system/docshell/test/chrome/582176_xml.xml
index d3dd576df..d3dd576df 100644
--- a/docshell/test/chrome/582176_xml.xml
+++ b/system/docshell/test/chrome/582176_xml.xml
diff --git a/docshell/test/chrome/582176_xslt.xsl b/system/docshell/test/chrome/582176_xslt.xsl
index 595741689..595741689 100644
--- a/docshell/test/chrome/582176_xslt.xsl
+++ b/system/docshell/test/chrome/582176_xslt.xsl
diff --git a/docshell/test/chrome/662200a.html b/system/docshell/test/chrome/662200a.html
index 0b9ead6f3..0b9ead6f3 100644
--- a/docshell/test/chrome/662200a.html
+++ b/system/docshell/test/chrome/662200a.html
diff --git a/docshell/test/chrome/662200b.html b/system/docshell/test/chrome/662200b.html
index 91e6b971d..91e6b971d 100644
--- a/docshell/test/chrome/662200b.html
+++ b/system/docshell/test/chrome/662200b.html
diff --git a/docshell/test/chrome/662200c.html b/system/docshell/test/chrome/662200c.html
index bc00e6b14..bc00e6b14 100644
--- a/docshell/test/chrome/662200c.html
+++ b/system/docshell/test/chrome/662200c.html
diff --git a/docshell/test/chrome/89419.html b/system/docshell/test/chrome/89419.html
index b36b8d788..b36b8d788 100644
--- a/docshell/test/chrome/89419.html
+++ b/system/docshell/test/chrome/89419.html
diff --git a/docshell/test/chrome/92598_nostore.html b/system/docshell/test/chrome/92598_nostore.html
index 47bb90441..47bb90441 100644
--- a/docshell/test/chrome/92598_nostore.html
+++ b/system/docshell/test/chrome/92598_nostore.html
diff --git a/docshell/test/chrome/92598_nostore.html^headers^ b/system/docshell/test/chrome/92598_nostore.html^headers^
index 59ba29610..59ba29610 100644
--- a/docshell/test/chrome/92598_nostore.html^headers^
+++ b/system/docshell/test/chrome/92598_nostore.html^headers^
diff --git a/docshell/test/chrome/allowContentRetargeting.sjs b/system/docshell/test/chrome/allowContentRetargeting.sjs
index 96e467ef6..96e467ef6 100644
--- a/docshell/test/chrome/allowContentRetargeting.sjs
+++ b/system/docshell/test/chrome/allowContentRetargeting.sjs
diff --git a/docshell/test/chrome/blue.png b/system/docshell/test/chrome/blue.png
index 8df58f3a5..8df58f3a5 100644
--- a/docshell/test/chrome/blue.png
+++ b/system/docshell/test/chrome/blue.png
diff --git a/docshell/test/chrome/bug112564_window.xul b/system/docshell/test/chrome/bug112564_window.xul
index e9c05ca9f..e9c05ca9f 100644
--- a/docshell/test/chrome/bug112564_window.xul
+++ b/system/docshell/test/chrome/bug112564_window.xul
diff --git a/docshell/test/chrome/bug113934_window.xul b/system/docshell/test/chrome/bug113934_window.xul
index 9dbfc3b8f..9dbfc3b8f 100644
--- a/docshell/test/chrome/bug113934_window.xul
+++ b/system/docshell/test/chrome/bug113934_window.xul
diff --git a/docshell/test/chrome/bug215405_window.xul b/system/docshell/test/chrome/bug215405_window.xul
index 1935eddee..1935eddee 100644
--- a/docshell/test/chrome/bug215405_window.xul
+++ b/system/docshell/test/chrome/bug215405_window.xul
diff --git a/docshell/test/chrome/bug293235.html b/system/docshell/test/chrome/bug293235.html
index 458f88431..458f88431 100644
--- a/docshell/test/chrome/bug293235.html
+++ b/system/docshell/test/chrome/bug293235.html
diff --git a/docshell/test/chrome/bug293235_p2.html b/system/docshell/test/chrome/bug293235_p2.html
index 2de067b80..2de067b80 100644
--- a/docshell/test/chrome/bug293235_p2.html
+++ b/system/docshell/test/chrome/bug293235_p2.html
diff --git a/docshell/test/chrome/bug293235_window.xul b/system/docshell/test/chrome/bug293235_window.xul
index b5b359d48..b5b359d48 100644
--- a/docshell/test/chrome/bug293235_window.xul
+++ b/system/docshell/test/chrome/bug293235_window.xul
diff --git a/docshell/test/chrome/bug294258_testcase.html b/system/docshell/test/chrome/bug294258_testcase.html
index cd80fefd0..cd80fefd0 100644
--- a/docshell/test/chrome/bug294258_testcase.html
+++ b/system/docshell/test/chrome/bug294258_testcase.html
diff --git a/docshell/test/chrome/bug294258_window.xul b/system/docshell/test/chrome/bug294258_window.xul
index f25097eab..f25097eab 100644
--- a/docshell/test/chrome/bug294258_window.xul
+++ b/system/docshell/test/chrome/bug294258_window.xul
diff --git a/docshell/test/chrome/bug298622_window.xul b/system/docshell/test/chrome/bug298622_window.xul
index 2773f3420..2773f3420 100755..100644
--- a/docshell/test/chrome/bug298622_window.xul
+++ b/system/docshell/test/chrome/bug298622_window.xul
diff --git a/docshell/test/chrome/bug301397_1.html b/system/docshell/test/chrome/bug301397_1.html
index 9943c2efe..9943c2efe 100644
--- a/docshell/test/chrome/bug301397_1.html
+++ b/system/docshell/test/chrome/bug301397_1.html
diff --git a/docshell/test/chrome/bug301397_2.html b/system/docshell/test/chrome/bug301397_2.html
index 423710706..423710706 100644
--- a/docshell/test/chrome/bug301397_2.html
+++ b/system/docshell/test/chrome/bug301397_2.html
diff --git a/docshell/test/chrome/bug301397_3.html b/system/docshell/test/chrome/bug301397_3.html
index 8d36e9246..8d36e9246 100644
--- a/docshell/test/chrome/bug301397_3.html
+++ b/system/docshell/test/chrome/bug301397_3.html
diff --git a/docshell/test/chrome/bug301397_4.html b/system/docshell/test/chrome/bug301397_4.html
index 5584a4554..5584a4554 100644
--- a/docshell/test/chrome/bug301397_4.html
+++ b/system/docshell/test/chrome/bug301397_4.html
diff --git a/docshell/test/chrome/bug301397_window.xul b/system/docshell/test/chrome/bug301397_window.xul
index 5df33c5c9..5df33c5c9 100644
--- a/docshell/test/chrome/bug301397_window.xul
+++ b/system/docshell/test/chrome/bug301397_window.xul
diff --git a/docshell/test/chrome/bug303267.html b/system/docshell/test/chrome/bug303267.html
index 32b575eee..32b575eee 100644
--- a/docshell/test/chrome/bug303267.html
+++ b/system/docshell/test/chrome/bug303267.html
diff --git a/docshell/test/chrome/bug303267_window.xul b/system/docshell/test/chrome/bug303267_window.xul
index 46a193712..46a193712 100755..100644
--- a/docshell/test/chrome/bug303267_window.xul
+++ b/system/docshell/test/chrome/bug303267_window.xul
diff --git a/docshell/test/chrome/bug311007_window.xul b/system/docshell/test/chrome/bug311007_window.xul
index 730580cc2..730580cc2 100644
--- a/docshell/test/chrome/bug311007_window.xul
+++ b/system/docshell/test/chrome/bug311007_window.xul
diff --git a/docshell/test/chrome/bug321671_window.xul b/system/docshell/test/chrome/bug321671_window.xul
index addd04570..addd04570 100755..100644
--- a/docshell/test/chrome/bug321671_window.xul
+++ b/system/docshell/test/chrome/bug321671_window.xul
diff --git a/docshell/test/chrome/bug360511_case1.html b/system/docshell/test/chrome/bug360511_case1.html
index cca043bb6..cca043bb6 100644
--- a/docshell/test/chrome/bug360511_case1.html
+++ b/system/docshell/test/chrome/bug360511_case1.html
diff --git a/docshell/test/chrome/bug360511_case2.html b/system/docshell/test/chrome/bug360511_case2.html
index 217f47724..217f47724 100644
--- a/docshell/test/chrome/bug360511_case2.html
+++ b/system/docshell/test/chrome/bug360511_case2.html
diff --git a/docshell/test/chrome/bug360511_window.xul b/system/docshell/test/chrome/bug360511_window.xul
index 9d0cde7f1..9d0cde7f1 100755..100644
--- a/docshell/test/chrome/bug360511_window.xul
+++ b/system/docshell/test/chrome/bug360511_window.xul
diff --git a/docshell/test/chrome/bug364461_window.xul b/system/docshell/test/chrome/bug364461_window.xul
index a05a33b3f..a05a33b3f 100644
--- a/docshell/test/chrome/bug364461_window.xul
+++ b/system/docshell/test/chrome/bug364461_window.xul
diff --git a/docshell/test/chrome/bug396519_window.xul b/system/docshell/test/chrome/bug396519_window.xul
index 32497b163..32497b163 100644
--- a/docshell/test/chrome/bug396519_window.xul
+++ b/system/docshell/test/chrome/bug396519_window.xul
diff --git a/docshell/test/chrome/bug396649_window.xul b/system/docshell/test/chrome/bug396649_window.xul
index c94d8b78e..c94d8b78e 100755..100644
--- a/docshell/test/chrome/bug396649_window.xul
+++ b/system/docshell/test/chrome/bug396649_window.xul
diff --git a/docshell/test/chrome/bug449778_window.xul b/system/docshell/test/chrome/bug449778_window.xul
index b4fc5e2ba..b4fc5e2ba 100644
--- a/docshell/test/chrome/bug449778_window.xul
+++ b/system/docshell/test/chrome/bug449778_window.xul
diff --git a/docshell/test/chrome/bug449780_window.xul b/system/docshell/test/chrome/bug449780_window.xul
index 38633c00f..38633c00f 100644
--- a/docshell/test/chrome/bug449780_window.xul
+++ b/system/docshell/test/chrome/bug449780_window.xul
diff --git a/docshell/test/chrome/bug454235-subframe.xul b/system/docshell/test/chrome/bug454235-subframe.xul
index a8b6178e6..a8b6178e6 100644
--- a/docshell/test/chrome/bug454235-subframe.xul
+++ b/system/docshell/test/chrome/bug454235-subframe.xul
diff --git a/docshell/test/chrome/bug582176_window.xul b/system/docshell/test/chrome/bug582176_window.xul
index ad594ee0c..ad594ee0c 100644
--- a/docshell/test/chrome/bug582176_window.xul
+++ b/system/docshell/test/chrome/bug582176_window.xul
diff --git a/docshell/test/chrome/bug608669.xul b/system/docshell/test/chrome/bug608669.xul
index 1ab012c14..1ab012c14 100644
--- a/docshell/test/chrome/bug608669.xul
+++ b/system/docshell/test/chrome/bug608669.xul
diff --git a/docshell/test/chrome/bug662200_window.xul b/system/docshell/test/chrome/bug662200_window.xul
index a73e2d296..a73e2d296 100644
--- a/docshell/test/chrome/bug662200_window.xul
+++ b/system/docshell/test/chrome/bug662200_window.xul
diff --git a/docshell/test/chrome/bug690056_window.xul b/system/docshell/test/chrome/bug690056_window.xul
index ce5700e39..ce5700e39 100644
--- a/docshell/test/chrome/bug690056_window.xul
+++ b/system/docshell/test/chrome/bug690056_window.xul
diff --git a/docshell/test/chrome/bug846906.html b/system/docshell/test/chrome/bug846906.html
index a289417ea..a289417ea 100644
--- a/docshell/test/chrome/bug846906.html
+++ b/system/docshell/test/chrome/bug846906.html
diff --git a/docshell/test/chrome/bug89419.sjs b/system/docshell/test/chrome/bug89419.sjs
index c075b1e50..c075b1e50 100644
--- a/docshell/test/chrome/bug89419.sjs
+++ b/system/docshell/test/chrome/bug89419.sjs
diff --git a/docshell/test/chrome/bug89419_window.xul b/system/docshell/test/chrome/bug89419_window.xul
index 923378ea0..923378ea0 100644
--- a/docshell/test/chrome/bug89419_window.xul
+++ b/system/docshell/test/chrome/bug89419_window.xul
diff --git a/docshell/test/chrome/bug909218.html b/system/docshell/test/chrome/bug909218.html
index a11fa6000..a11fa6000 100644
--- a/docshell/test/chrome/bug909218.html
+++ b/system/docshell/test/chrome/bug909218.html
diff --git a/docshell/test/chrome/bug909218.js b/system/docshell/test/chrome/bug909218.js
index c360616f9..c360616f9 100644
--- a/docshell/test/chrome/bug909218.js
+++ b/system/docshell/test/chrome/bug909218.js
diff --git a/docshell/test/chrome/bug92598_window.xul b/system/docshell/test/chrome/bug92598_window.xul
index ed877b383..ed877b383 100644
--- a/docshell/test/chrome/bug92598_window.xul
+++ b/system/docshell/test/chrome/bug92598_window.xul
diff --git a/docshell/test/chrome/chrome.ini b/system/docshell/test/chrome/chrome.ini
index c3c5b9f80..c3c5b9f80 100644
--- a/docshell/test/chrome/chrome.ini
+++ b/system/docshell/test/chrome/chrome.ini
diff --git a/docshell/test/chrome/docshell_helpers.js b/system/docshell/test/chrome/docshell_helpers.js
index 2d55e5a6e..2d55e5a6e 100755..100644
--- a/docshell/test/chrome/docshell_helpers.js
+++ b/system/docshell/test/chrome/docshell_helpers.js
diff --git a/docshell/test/chrome/file_viewsource_forbidden_in_iframe.html b/system/docshell/test/chrome/file_viewsource_forbidden_in_iframe.html
index fdecbbdfe..fdecbbdfe 100644
--- a/docshell/test/chrome/file_viewsource_forbidden_in_iframe.html
+++ b/system/docshell/test/chrome/file_viewsource_forbidden_in_iframe.html
diff --git a/docshell/test/chrome/gen_template.pl b/system/docshell/test/chrome/gen_template.pl
index 5fe9e9ea4..5fe9e9ea4 100644
--- a/docshell/test/chrome/gen_template.pl
+++ b/system/docshell/test/chrome/gen_template.pl
diff --git a/docshell/test/chrome/generic.html b/system/docshell/test/chrome/generic.html
index 569a78c05..569a78c05 100644
--- a/docshell/test/chrome/generic.html
+++ b/system/docshell/test/chrome/generic.html
diff --git a/docshell/test/chrome/mozFrameType_window.xul b/system/docshell/test/chrome/mozFrameType_window.xul
index aa811c333..aa811c333 100644
--- a/docshell/test/chrome/mozFrameType_window.xul
+++ b/system/docshell/test/chrome/mozFrameType_window.xul
diff --git a/docshell/test/chrome/red.png b/system/docshell/test/chrome/red.png
index aa9ce2526..aa9ce2526 100644
--- a/docshell/test/chrome/red.png
+++ b/system/docshell/test/chrome/red.png
diff --git a/docshell/test/chrome/test.template.txt b/system/docshell/test/chrome/test.template.txt
index b7dd5e5c2..b7dd5e5c2 100644
--- a/docshell/test/chrome/test.template.txt
+++ b/system/docshell/test/chrome/test.template.txt
diff --git a/docshell/test/chrome/test_allowContentRetargeting.html b/system/docshell/test/chrome/test_allowContentRetargeting.html
index 58e838ca0..58e838ca0 100644
--- a/docshell/test/chrome/test_allowContentRetargeting.html
+++ b/system/docshell/test/chrome/test_allowContentRetargeting.html
diff --git a/docshell/test/chrome/test_bug112564.xul b/system/docshell/test/chrome/test_bug112564.xul
index 0706595d0..0706595d0 100644
--- a/docshell/test/chrome/test_bug112564.xul
+++ b/system/docshell/test/chrome/test_bug112564.xul
diff --git a/docshell/test/chrome/test_bug113934.xul b/system/docshell/test/chrome/test_bug113934.xul
index ba297e035..ba297e035 100644
--- a/docshell/test/chrome/test_bug113934.xul
+++ b/system/docshell/test/chrome/test_bug113934.xul
diff --git a/docshell/test/chrome/test_bug215405.xul b/system/docshell/test/chrome/test_bug215405.xul
index e934d76ca..e934d76ca 100644
--- a/docshell/test/chrome/test_bug215405.xul
+++ b/system/docshell/test/chrome/test_bug215405.xul
diff --git a/docshell/test/chrome/test_bug293235.xul b/system/docshell/test/chrome/test_bug293235.xul
index 8a42c0a6e..8a42c0a6e 100644
--- a/docshell/test/chrome/test_bug293235.xul
+++ b/system/docshell/test/chrome/test_bug293235.xul
diff --git a/docshell/test/chrome/test_bug294258.xul b/system/docshell/test/chrome/test_bug294258.xul
index 4658a82de..4658a82de 100644
--- a/docshell/test/chrome/test_bug294258.xul
+++ b/system/docshell/test/chrome/test_bug294258.xul
diff --git a/docshell/test/chrome/test_bug298622.xul b/system/docshell/test/chrome/test_bug298622.xul
index c3217c7e5..c3217c7e5 100644
--- a/docshell/test/chrome/test_bug298622.xul
+++ b/system/docshell/test/chrome/test_bug298622.xul
diff --git a/docshell/test/chrome/test_bug301397.xul b/system/docshell/test/chrome/test_bug301397.xul
index 37fe47993..37fe47993 100644
--- a/docshell/test/chrome/test_bug301397.xul
+++ b/system/docshell/test/chrome/test_bug301397.xul
diff --git a/docshell/test/chrome/test_bug303267.xul b/system/docshell/test/chrome/test_bug303267.xul
index f68dbdcd2..f68dbdcd2 100644
--- a/docshell/test/chrome/test_bug303267.xul
+++ b/system/docshell/test/chrome/test_bug303267.xul
diff --git a/docshell/test/chrome/test_bug311007.xul b/system/docshell/test/chrome/test_bug311007.xul
index 32f1085f0..32f1085f0 100644
--- a/docshell/test/chrome/test_bug311007.xul
+++ b/system/docshell/test/chrome/test_bug311007.xul
diff --git a/docshell/test/chrome/test_bug321671.xul b/system/docshell/test/chrome/test_bug321671.xul
index 46164018b..46164018b 100644
--- a/docshell/test/chrome/test_bug321671.xul
+++ b/system/docshell/test/chrome/test_bug321671.xul
diff --git a/docshell/test/chrome/test_bug360511.xul b/system/docshell/test/chrome/test_bug360511.xul
index ffa47fa27..ffa47fa27 100644
--- a/docshell/test/chrome/test_bug360511.xul
+++ b/system/docshell/test/chrome/test_bug360511.xul
diff --git a/docshell/test/chrome/test_bug364461.xul b/system/docshell/test/chrome/test_bug364461.xul
index 9e45ce971..9e45ce971 100644
--- a/docshell/test/chrome/test_bug364461.xul
+++ b/system/docshell/test/chrome/test_bug364461.xul
diff --git a/docshell/test/chrome/test_bug396519.xul b/system/docshell/test/chrome/test_bug396519.xul
index be1d148b7..be1d148b7 100644
--- a/docshell/test/chrome/test_bug396519.xul
+++ b/system/docshell/test/chrome/test_bug396519.xul
diff --git a/docshell/test/chrome/test_bug396649.xul b/system/docshell/test/chrome/test_bug396649.xul
index 3554c2f98..3554c2f98 100644
--- a/docshell/test/chrome/test_bug396649.xul
+++ b/system/docshell/test/chrome/test_bug396649.xul
diff --git a/docshell/test/chrome/test_bug428288.html b/system/docshell/test/chrome/test_bug428288.html
index 83fcd20c6..83fcd20c6 100644
--- a/docshell/test/chrome/test_bug428288.html
+++ b/system/docshell/test/chrome/test_bug428288.html
diff --git a/docshell/test/chrome/test_bug449778.xul b/system/docshell/test/chrome/test_bug449778.xul
index 48c76c2e2..48c76c2e2 100644
--- a/docshell/test/chrome/test_bug449778.xul
+++ b/system/docshell/test/chrome/test_bug449778.xul
diff --git a/docshell/test/chrome/test_bug449780.xul b/system/docshell/test/chrome/test_bug449780.xul
index fc5231d6b..fc5231d6b 100644
--- a/docshell/test/chrome/test_bug449780.xul
+++ b/system/docshell/test/chrome/test_bug449780.xul
diff --git a/docshell/test/chrome/test_bug453650.xul b/system/docshell/test/chrome/test_bug453650.xul
index 04acefe6d..04acefe6d 100755..100644
--- a/docshell/test/chrome/test_bug453650.xul
+++ b/system/docshell/test/chrome/test_bug453650.xul
diff --git a/docshell/test/chrome/test_bug454235.xul b/system/docshell/test/chrome/test_bug454235.xul
index f9107a186..f9107a186 100644
--- a/docshell/test/chrome/test_bug454235.xul
+++ b/system/docshell/test/chrome/test_bug454235.xul
diff --git a/docshell/test/chrome/test_bug456980.xul b/system/docshell/test/chrome/test_bug456980.xul
index 9f4f97209..9f4f97209 100644
--- a/docshell/test/chrome/test_bug456980.xul
+++ b/system/docshell/test/chrome/test_bug456980.xul
diff --git a/docshell/test/chrome/test_bug565388.xul b/system/docshell/test/chrome/test_bug565388.xul
index 47b5c07e4..47b5c07e4 100644
--- a/docshell/test/chrome/test_bug565388.xul
+++ b/system/docshell/test/chrome/test_bug565388.xul
diff --git a/docshell/test/chrome/test_bug582176.xul b/system/docshell/test/chrome/test_bug582176.xul
index 98053b009..98053b009 100644
--- a/docshell/test/chrome/test_bug582176.xul
+++ b/system/docshell/test/chrome/test_bug582176.xul
diff --git a/docshell/test/chrome/test_bug608669.xul b/system/docshell/test/chrome/test_bug608669.xul
index 51d6a3b7d..51d6a3b7d 100644
--- a/docshell/test/chrome/test_bug608669.xul
+++ b/system/docshell/test/chrome/test_bug608669.xul
diff --git a/docshell/test/chrome/test_bug662200.xul b/system/docshell/test/chrome/test_bug662200.xul
index 8b864c8af..8b864c8af 100644
--- a/docshell/test/chrome/test_bug662200.xul
+++ b/system/docshell/test/chrome/test_bug662200.xul
diff --git a/docshell/test/chrome/test_bug690056.xul b/system/docshell/test/chrome/test_bug690056.xul
index caeed09d3..caeed09d3 100644
--- a/docshell/test/chrome/test_bug690056.xul
+++ b/system/docshell/test/chrome/test_bug690056.xul
diff --git a/docshell/test/chrome/test_bug789773.xul b/system/docshell/test/chrome/test_bug789773.xul
index b7a2b3d1c..b7a2b3d1c 100644
--- a/docshell/test/chrome/test_bug789773.xul
+++ b/system/docshell/test/chrome/test_bug789773.xul
diff --git a/docshell/test/chrome/test_bug846906.xul b/system/docshell/test/chrome/test_bug846906.xul
index 2003384f0..2003384f0 100644
--- a/docshell/test/chrome/test_bug846906.xul
+++ b/system/docshell/test/chrome/test_bug846906.xul
diff --git a/docshell/test/chrome/test_bug89419.xul b/system/docshell/test/chrome/test_bug89419.xul
index 26194c49b..26194c49b 100644
--- a/docshell/test/chrome/test_bug89419.xul
+++ b/system/docshell/test/chrome/test_bug89419.xul
diff --git a/docshell/test/chrome/test_bug909218.html b/system/docshell/test/chrome/test_bug909218.html
index e635fdb11..e635fdb11 100644
--- a/docshell/test/chrome/test_bug909218.html
+++ b/system/docshell/test/chrome/test_bug909218.html
diff --git a/docshell/test/chrome/test_bug92598.xul b/system/docshell/test/chrome/test_bug92598.xul
index 8e81463be..8e81463be 100644
--- a/docshell/test/chrome/test_bug92598.xul
+++ b/system/docshell/test/chrome/test_bug92598.xul
diff --git a/docshell/test/chrome/test_mozFrameType.xul b/system/docshell/test/chrome/test_mozFrameType.xul
index 225cd16cc..225cd16cc 100644
--- a/docshell/test/chrome/test_mozFrameType.xul
+++ b/system/docshell/test/chrome/test_mozFrameType.xul
diff --git a/docshell/test/chrome/test_principalInherit.xul b/system/docshell/test/chrome/test_principalInherit.xul
index 87056c63d..87056c63d 100644
--- a/docshell/test/chrome/test_principalInherit.xul
+++ b/system/docshell/test/chrome/test_principalInherit.xul
diff --git a/docshell/test/chrome/test_private_hidden_window.html b/system/docshell/test/chrome/test_private_hidden_window.html
index 3907e5de8..3907e5de8 100644
--- a/docshell/test/chrome/test_private_hidden_window.html
+++ b/system/docshell/test/chrome/test_private_hidden_window.html
diff --git a/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul b/system/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
index 536ca4d03..536ca4d03 100644
--- a/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
+++ b/system/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
diff --git a/docshell/test/chrome/window.template.txt b/system/docshell/test/chrome/window.template.txt
index a7fb0fac7..a7fb0fac7 100644
--- a/docshell/test/chrome/window.template.txt
+++ b/system/docshell/test/chrome/window.template.txt
diff --git a/docshell/test/dummy_page.html b/system/docshell/test/dummy_page.html
index 59bf2a5f8..59bf2a5f8 100644
--- a/docshell/test/dummy_page.html
+++ b/system/docshell/test/dummy_page.html
diff --git a/docshell/test/file_anchor_scroll_after_document_open.html b/system/docshell/test/file_anchor_scroll_after_document_open.html
index 7903380ea..7903380ea 100644
--- a/docshell/test/file_anchor_scroll_after_document_open.html
+++ b/system/docshell/test/file_anchor_scroll_after_document_open.html
diff --git a/docshell/test/file_bug1151421.html b/system/docshell/test/file_bug1151421.html
index 7bb8c8f36..7bb8c8f36 100644
--- a/docshell/test/file_bug1151421.html
+++ b/system/docshell/test/file_bug1151421.html
diff --git a/docshell/test/file_bug385434_1.html b/system/docshell/test/file_bug385434_1.html
index 5c951f1fa..5c951f1fa 100644
--- a/docshell/test/file_bug385434_1.html
+++ b/system/docshell/test/file_bug385434_1.html
diff --git a/docshell/test/file_bug385434_2.html b/system/docshell/test/file_bug385434_2.html
index 4aa5ef82b..4aa5ef82b 100644
--- a/docshell/test/file_bug385434_2.html
+++ b/system/docshell/test/file_bug385434_2.html
diff --git a/docshell/test/file_bug385434_3.html b/system/docshell/test/file_bug385434_3.html
index 984b85f1f..984b85f1f 100644
--- a/docshell/test/file_bug385434_3.html
+++ b/system/docshell/test/file_bug385434_3.html
diff --git a/docshell/test/file_bug475636.sjs b/system/docshell/test/file_bug475636.sjs
index 38da6a6a5..38da6a6a5 100644
--- a/docshell/test/file_bug475636.sjs
+++ b/system/docshell/test/file_bug475636.sjs
diff --git a/docshell/test/file_bug509055.html b/system/docshell/test/file_bug509055.html
index ac30876bb..ac30876bb 100644
--- a/docshell/test/file_bug509055.html
+++ b/system/docshell/test/file_bug509055.html
diff --git a/docshell/test/file_bug511449.html b/system/docshell/test/file_bug511449.html
index 637732dbb..637732dbb 100644
--- a/docshell/test/file_bug511449.html
+++ b/system/docshell/test/file_bug511449.html
diff --git a/docshell/test/file_bug540462.html b/system/docshell/test/file_bug540462.html
index 52d1580c7..52d1580c7 100644
--- a/docshell/test/file_bug540462.html
+++ b/system/docshell/test/file_bug540462.html
diff --git a/docshell/test/file_bug580069_1.html b/system/docshell/test/file_bug580069_1.html
index 7ab461033..7ab461033 100644
--- a/docshell/test/file_bug580069_1.html
+++ b/system/docshell/test/file_bug580069_1.html
diff --git a/docshell/test/file_bug580069_2.sjs b/system/docshell/test/file_bug580069_2.sjs
index 0c76c1f16..0c76c1f16 100644
--- a/docshell/test/file_bug580069_2.sjs
+++ b/system/docshell/test/file_bug580069_2.sjs
diff --git a/docshell/test/file_bug590573_1.html b/system/docshell/test/file_bug590573_1.html
index 850d418bd..850d418bd 100644
--- a/docshell/test/file_bug590573_1.html
+++ b/system/docshell/test/file_bug590573_1.html
diff --git a/docshell/test/file_bug590573_2.html b/system/docshell/test/file_bug590573_2.html
index 5f9ca22be..5f9ca22be 100644
--- a/docshell/test/file_bug590573_2.html
+++ b/system/docshell/test/file_bug590573_2.html
diff --git a/docshell/test/file_bug598895_1.html b/system/docshell/test/file_bug598895_1.html
index 6fbb13a02..6fbb13a02 100644
--- a/docshell/test/file_bug598895_1.html
+++ b/system/docshell/test/file_bug598895_1.html
diff --git a/docshell/test/file_bug598895_2.html b/system/docshell/test/file_bug598895_2.html
index 0822c566b..0822c566b 100644
--- a/docshell/test/file_bug598895_2.html
+++ b/system/docshell/test/file_bug598895_2.html
diff --git a/docshell/test/file_bug634834.html b/system/docshell/test/file_bug634834.html
index 3ff089745..3ff089745 100644
--- a/docshell/test/file_bug634834.html
+++ b/system/docshell/test/file_bug634834.html
diff --git a/docshell/test/file_bug637644_1.html b/system/docshell/test/file_bug637644_1.html
index 6fbb13a02..6fbb13a02 100644
--- a/docshell/test/file_bug637644_1.html
+++ b/system/docshell/test/file_bug637644_1.html
diff --git a/docshell/test/file_bug637644_2.html b/system/docshell/test/file_bug637644_2.html
index 0822c566b..0822c566b 100644
--- a/docshell/test/file_bug637644_2.html
+++ b/system/docshell/test/file_bug637644_2.html
diff --git a/docshell/test/file_bug640387.html b/system/docshell/test/file_bug640387.html
index 3a939fb41..3a939fb41 100644
--- a/docshell/test/file_bug640387.html
+++ b/system/docshell/test/file_bug640387.html
diff --git a/docshell/test/file_bug653741.html b/system/docshell/test/file_bug653741.html
index 3202b5257..3202b5257 100644
--- a/docshell/test/file_bug653741.html
+++ b/system/docshell/test/file_bug653741.html
diff --git a/docshell/test/file_bug660404 b/system/docshell/test/file_bug660404
index 0737a5c4d..0737a5c4d 100644
--- a/docshell/test/file_bug660404
+++ b/system/docshell/test/file_bug660404
diff --git a/docshell/test/file_bug660404^headers^ b/system/docshell/test/file_bug660404^headers^
index 5c821f3f4..5c821f3f4 100644
--- a/docshell/test/file_bug660404^headers^
+++ b/system/docshell/test/file_bug660404^headers^
diff --git a/docshell/test/file_bug662170.html b/system/docshell/test/file_bug662170.html
index 3202b5257..3202b5257 100644
--- a/docshell/test/file_bug662170.html
+++ b/system/docshell/test/file_bug662170.html
diff --git a/docshell/test/file_bug668513.html b/system/docshell/test/file_bug668513.html
index 1e43a51e0..1e43a51e0 100644
--- a/docshell/test/file_bug668513.html
+++ b/system/docshell/test/file_bug668513.html
diff --git a/docshell/test/file_bug669671.sjs b/system/docshell/test/file_bug669671.sjs
index b6fd1ec7c..b6fd1ec7c 100644
--- a/docshell/test/file_bug669671.sjs
+++ b/system/docshell/test/file_bug669671.sjs
diff --git a/docshell/test/file_bug680257.html b/system/docshell/test/file_bug680257.html
index ff480e96a..ff480e96a 100644
--- a/docshell/test/file_bug680257.html
+++ b/system/docshell/test/file_bug680257.html
diff --git a/docshell/test/file_bug703855.html b/system/docshell/test/file_bug703855.html
index fe15b6e3d..fe15b6e3d 100644
--- a/docshell/test/file_bug703855.html
+++ b/system/docshell/test/file_bug703855.html
diff --git a/docshell/test/file_bug728939.html b/system/docshell/test/file_bug728939.html
index 1cd52a44e..1cd52a44e 100644
--- a/docshell/test/file_bug728939.html
+++ b/system/docshell/test/file_bug728939.html
diff --git a/docshell/test/file_framedhistoryframes.html b/system/docshell/test/file_framedhistoryframes.html
index 314f9c72d..314f9c72d 100644
--- a/docshell/test/file_framedhistoryframes.html
+++ b/system/docshell/test/file_framedhistoryframes.html
diff --git a/docshell/test/file_pushState_after_document_open.html b/system/docshell/test/file_pushState_after_document_open.html
index 97a6954f2..97a6954f2 100644
--- a/docshell/test/file_pushState_after_document_open.html
+++ b/system/docshell/test/file_pushState_after_document_open.html
diff --git a/docshell/test/historyframes.html b/system/docshell/test/historyframes.html
index 30fca2c0a..30fca2c0a 100644
--- a/docshell/test/historyframes.html
+++ b/system/docshell/test/historyframes.html
diff --git a/docshell/test/iframesandbox/file_marquee_event_handlers.html b/system/docshell/test/iframesandbox/file_marquee_event_handlers.html
index 13ee31ddb..13ee31ddb 100644
--- a/docshell/test/iframesandbox/file_marquee_event_handlers.html
+++ b/system/docshell/test/iframesandbox/file_marquee_event_handlers.html
diff --git a/docshell/test/iframesandbox/file_other_auxiliary_navigation_by_location.html b/system/docshell/test/iframesandbox/file_other_auxiliary_navigation_by_location.html
index ad24c0f24..ad24c0f24 100644
--- a/docshell/test/iframesandbox/file_other_auxiliary_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/file_other_auxiliary_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/file_our_auxiliary_navigation_by_location.html b/system/docshell/test/iframesandbox/file_our_auxiliary_navigation_by_location.html
index 978980df2..978980df2 100644
--- a/docshell/test/iframesandbox/file_our_auxiliary_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/file_our_auxiliary_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/file_parent_navigation_by_location.html b/system/docshell/test/iframesandbox/file_parent_navigation_by_location.html
index 9a2e95fad..9a2e95fad 100644
--- a/docshell/test/iframesandbox/file_parent_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/file_parent_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/file_sibling_navigation_by_location.html b/system/docshell/test/iframesandbox/file_sibling_navigation_by_location.html
index 51a52bb8e..51a52bb8e 100644
--- a/docshell/test/iframesandbox/file_sibling_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/file_sibling_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/file_top_navigation_by_location.html b/system/docshell/test/iframesandbox/file_top_navigation_by_location.html
index 194430f38..194430f38 100644
--- a/docshell/test/iframesandbox/file_top_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/file_top_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/file_top_navigation_by_location_exotic.html b/system/docshell/test/iframesandbox/file_top_navigation_by_location_exotic.html
index 1c7c6ce29..1c7c6ce29 100644
--- a/docshell/test/iframesandbox/file_top_navigation_by_location_exotic.html
+++ b/system/docshell/test/iframesandbox/file_top_navigation_by_location_exotic.html
diff --git a/docshell/test/iframesandbox/mochitest.ini b/system/docshell/test/iframesandbox/mochitest.ini
index 5f6b570e9..5f6b570e9 100644
--- a/docshell/test/iframesandbox/mochitest.ini
+++ b/system/docshell/test/iframesandbox/mochitest.ini
diff --git a/docshell/test/iframesandbox/test_child_navigation_by_location.html b/system/docshell/test/iframesandbox/test_child_navigation_by_location.html
index 06605e3cd..06605e3cd 100644
--- a/docshell/test/iframesandbox/test_child_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/test_child_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/test_marquee_event_handlers.html b/system/docshell/test/iframesandbox/test_marquee_event_handlers.html
index f243e4834..f243e4834 100644
--- a/docshell/test/iframesandbox/test_marquee_event_handlers.html
+++ b/system/docshell/test/iframesandbox/test_marquee_event_handlers.html
diff --git a/docshell/test/iframesandbox/test_other_auxiliary_navigation_by_location.html b/system/docshell/test/iframesandbox/test_other_auxiliary_navigation_by_location.html
index 05c86f0cc..05c86f0cc 100644
--- a/docshell/test/iframesandbox/test_other_auxiliary_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/test_other_auxiliary_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/test_our_auxiliary_navigation_by_location.html b/system/docshell/test/iframesandbox/test_our_auxiliary_navigation_by_location.html
index 01b371545..01b371545 100644
--- a/docshell/test/iframesandbox/test_our_auxiliary_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/test_our_auxiliary_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/test_parent_navigation_by_location.html b/system/docshell/test/iframesandbox/test_parent_navigation_by_location.html
index 06335cdec..06335cdec 100644
--- a/docshell/test/iframesandbox/test_parent_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/test_parent_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/test_sibling_navigation_by_location.html b/system/docshell/test/iframesandbox/test_sibling_navigation_by_location.html
index a93c1ae0d..a93c1ae0d 100644
--- a/docshell/test/iframesandbox/test_sibling_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/test_sibling_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/test_top_navigation_by_location.html b/system/docshell/test/iframesandbox/test_top_navigation_by_location.html
index 3191539a2..3191539a2 100644
--- a/docshell/test/iframesandbox/test_top_navigation_by_location.html
+++ b/system/docshell/test/iframesandbox/test_top_navigation_by_location.html
diff --git a/docshell/test/iframesandbox/test_top_navigation_by_location_exotic.html b/system/docshell/test/iframesandbox/test_top_navigation_by_location_exotic.html
index fcc1f8659..fcc1f8659 100644
--- a/docshell/test/iframesandbox/test_top_navigation_by_location_exotic.html
+++ b/system/docshell/test/iframesandbox/test_top_navigation_by_location_exotic.html
diff --git a/docshell/test/mochitest.ini b/system/docshell/test/mochitest.ini
index d2e378928..d2e378928 100644
--- a/docshell/test/mochitest.ini
+++ b/system/docshell/test/mochitest.ini
diff --git a/docshell/test/navigation/NavigationUtils.js b/system/docshell/test/navigation/NavigationUtils.js
index 72bea7dde..72bea7dde 100644
--- a/docshell/test/navigation/NavigationUtils.js
+++ b/system/docshell/test/navigation/NavigationUtils.js
diff --git a/docshell/test/navigation/blank.html b/system/docshell/test/navigation/blank.html
index 5360333f1..5360333f1 100644
--- a/docshell/test/navigation/blank.html
+++ b/system/docshell/test/navigation/blank.html
diff --git a/docshell/test/navigation/browser.ini b/system/docshell/test/navigation/browser.ini
index f25853f89..f25853f89 100644
--- a/docshell/test/navigation/browser.ini
+++ b/system/docshell/test/navigation/browser.ini
diff --git a/docshell/test/navigation/browser_bug343515.js b/system/docshell/test/navigation/browser_bug343515.js
index 74152b493..74152b493 100644
--- a/docshell/test/navigation/browser_bug343515.js
+++ b/system/docshell/test/navigation/browser_bug343515.js
diff --git a/docshell/test/navigation/browser_test-content-chromeflags.js b/system/docshell/test/navigation/browser_test-content-chromeflags.js
index 64559897c..64559897c 100644
--- a/docshell/test/navigation/browser_test-content-chromeflags.js
+++ b/system/docshell/test/navigation/browser_test-content-chromeflags.js
diff --git a/docshell/test/navigation/bug343515_pg1.html b/system/docshell/test/navigation/bug343515_pg1.html
index a8337c7f7..a8337c7f7 100644
--- a/docshell/test/navigation/bug343515_pg1.html
+++ b/system/docshell/test/navigation/bug343515_pg1.html
diff --git a/docshell/test/navigation/bug343515_pg2.html b/system/docshell/test/navigation/bug343515_pg2.html
index c5f5665de..c5f5665de 100644
--- a/docshell/test/navigation/bug343515_pg2.html
+++ b/system/docshell/test/navigation/bug343515_pg2.html
diff --git a/docshell/test/navigation/bug343515_pg3.html b/system/docshell/test/navigation/bug343515_pg3.html
index fdc79fbf7..fdc79fbf7 100644
--- a/docshell/test/navigation/bug343515_pg3.html
+++ b/system/docshell/test/navigation/bug343515_pg3.html
diff --git a/docshell/test/navigation/bug343515_pg3_1.html b/system/docshell/test/navigation/bug343515_pg3_1.html
index 254164c9f..254164c9f 100644
--- a/docshell/test/navigation/bug343515_pg3_1.html
+++ b/system/docshell/test/navigation/bug343515_pg3_1.html
diff --git a/docshell/test/navigation/bug343515_pg3_1_1.html b/system/docshell/test/navigation/bug343515_pg3_1_1.html
index be05b7488..be05b7488 100644
--- a/docshell/test/navigation/bug343515_pg3_1_1.html
+++ b/system/docshell/test/navigation/bug343515_pg3_1_1.html
diff --git a/docshell/test/navigation/bug343515_pg3_2.html b/system/docshell/test/navigation/bug343515_pg3_2.html
index 7655eb526..7655eb526 100644
--- a/docshell/test/navigation/bug343515_pg3_2.html
+++ b/system/docshell/test/navigation/bug343515_pg3_2.html
diff --git a/docshell/test/navigation/file_bug1300461.html b/system/docshell/test/navigation/file_bug1300461.html
index 1ba935046..1ba935046 100644
--- a/docshell/test/navigation/file_bug1300461.html
+++ b/system/docshell/test/navigation/file_bug1300461.html
diff --git a/docshell/test/navigation/file_bug1300461_back.html b/system/docshell/test/navigation/file_bug1300461_back.html
index 7b187742f..7b187742f 100644
--- a/docshell/test/navigation/file_bug1300461_back.html
+++ b/system/docshell/test/navigation/file_bug1300461_back.html
diff --git a/docshell/test/navigation/file_bug1300461_redirect.html b/system/docshell/test/navigation/file_bug1300461_redirect.html
index 979530c5c..979530c5c 100644
--- a/docshell/test/navigation/file_bug1300461_redirect.html
+++ b/system/docshell/test/navigation/file_bug1300461_redirect.html
diff --git a/docshell/test/navigation/file_bug1300461_redirect.html^headers^ b/system/docshell/test/navigation/file_bug1300461_redirect.html^headers^
index 241b89182..241b89182 100644
--- a/docshell/test/navigation/file_bug1300461_redirect.html^headers^
+++ b/system/docshell/test/navigation/file_bug1300461_redirect.html^headers^
diff --git a/docshell/test/navigation/file_bug1379762-1.html b/system/docshell/test/navigation/file_bug1379762-1.html
index e8cd8b30b..e8cd8b30b 100644
--- a/docshell/test/navigation/file_bug1379762-1.html
+++ b/system/docshell/test/navigation/file_bug1379762-1.html
diff --git a/docshell/test/navigation/file_bug462076_1.html b/system/docshell/test/navigation/file_bug462076_1.html
index 5b7bf2b11..5b7bf2b11 100644
--- a/docshell/test/navigation/file_bug462076_1.html
+++ b/system/docshell/test/navigation/file_bug462076_1.html
diff --git a/docshell/test/navigation/file_bug462076_2.html b/system/docshell/test/navigation/file_bug462076_2.html
index 813a6d840..813a6d840 100644
--- a/docshell/test/navigation/file_bug462076_2.html
+++ b/system/docshell/test/navigation/file_bug462076_2.html
diff --git a/docshell/test/navigation/file_bug462076_3.html b/system/docshell/test/navigation/file_bug462076_3.html
index 0079b9cdf..0079b9cdf 100644
--- a/docshell/test/navigation/file_bug462076_3.html
+++ b/system/docshell/test/navigation/file_bug462076_3.html
diff --git a/docshell/test/navigation/file_bug508537_1.html b/system/docshell/test/navigation/file_bug508537_1.html
index 194165f43..194165f43 100644
--- a/docshell/test/navigation/file_bug508537_1.html
+++ b/system/docshell/test/navigation/file_bug508537_1.html
diff --git a/docshell/test/navigation/file_bug534178.html b/system/docshell/test/navigation/file_bug534178.html
index 8bcedb6fb..8bcedb6fb 100644
--- a/docshell/test/navigation/file_bug534178.html
+++ b/system/docshell/test/navigation/file_bug534178.html
diff --git a/docshell/test/navigation/file_contentpolicy_block_window.html b/system/docshell/test/navigation/file_contentpolicy_block_window.html
index c51e574e5..c51e574e5 100644
--- a/docshell/test/navigation/file_contentpolicy_block_window.html
+++ b/system/docshell/test/navigation/file_contentpolicy_block_window.html
diff --git a/docshell/test/navigation/file_document_write_1.html b/system/docshell/test/navigation/file_document_write_1.html
index 169046a9b..169046a9b 100644
--- a/docshell/test/navigation/file_document_write_1.html
+++ b/system/docshell/test/navigation/file_document_write_1.html
diff --git a/docshell/test/navigation/file_fragment_handling_during_load.html b/system/docshell/test/navigation/file_fragment_handling_during_load.html
index fbfa0cb38..fbfa0cb38 100644
--- a/docshell/test/navigation/file_fragment_handling_during_load.html
+++ b/system/docshell/test/navigation/file_fragment_handling_during_load.html
diff --git a/docshell/test/navigation/file_nested_frames.html b/system/docshell/test/navigation/file_nested_frames.html
index f65d8e01b..f65d8e01b 100644
--- a/docshell/test/navigation/file_nested_frames.html
+++ b/system/docshell/test/navigation/file_nested_frames.html
diff --git a/docshell/test/navigation/file_scrollRestoration.html b/system/docshell/test/navigation/file_scrollRestoration.html
index 766949d13..766949d13 100644
--- a/docshell/test/navigation/file_scrollRestoration.html
+++ b/system/docshell/test/navigation/file_scrollRestoration.html
diff --git a/docshell/test/navigation/file_shiftReload_and_pushState.html b/system/docshell/test/navigation/file_shiftReload_and_pushState.html
index 5a777894b..5a777894b 100644
--- a/docshell/test/navigation/file_shiftReload_and_pushState.html
+++ b/system/docshell/test/navigation/file_shiftReload_and_pushState.html
diff --git a/docshell/test/navigation/file_static_and_dynamic_1.html b/system/docshell/test/navigation/file_static_and_dynamic_1.html
index 692a5a9ab..692a5a9ab 100644
--- a/docshell/test/navigation/file_static_and_dynamic_1.html
+++ b/system/docshell/test/navigation/file_static_and_dynamic_1.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_frame_1.html b/system/docshell/test/navigation/file_triggeringprincipal_frame_1.html
index 1e21e6421..1e21e6421 100644
--- a/docshell/test/navigation/file_triggeringprincipal_frame_1.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_frame_1.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_frame_2.html b/system/docshell/test/navigation/file_triggeringprincipal_frame_2.html
index ef7cdfc17..ef7cdfc17 100644
--- a/docshell/test/navigation/file_triggeringprincipal_frame_2.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_frame_2.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a.html b/system/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a.html
index 75b2933c1..75b2933c1 100644
--- a/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a_nav.html b/system/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a_nav.html
index 0479f5e1e..0479f5e1e 100644
--- a/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a_nav.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_a_nav.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_b.html b/system/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_b.html
index e5d40b267..e5d40b267 100644
--- a/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_b.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_iframe_iframe_window_open_frame_b.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_base.html b/system/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_base.html
index caa6b275b..caa6b275b 100644
--- a/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_base.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_base.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_nav.html b/system/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_nav.html
index f4a4d0e63..f4a4d0e63 100644
--- a/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_nav.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_parent_iframe_window_open_nav.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_subframe.html b/system/docshell/test/navigation/file_triggeringprincipal_subframe.html
index 0db1349f2..0db1349f2 100644
--- a/docshell/test/navigation/file_triggeringprincipal_subframe.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_subframe.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html b/system/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html
index 3bf7097a6..3bf7097a6 100644
--- a/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html
diff --git a/docshell/test/navigation/file_triggeringprincipal_window_open.html b/system/docshell/test/navigation/file_triggeringprincipal_window_open.html
index d0644a4d5..d0644a4d5 100644
--- a/docshell/test/navigation/file_triggeringprincipal_window_open.html
+++ b/system/docshell/test/navigation/file_triggeringprincipal_window_open.html
diff --git a/docshell/test/navigation/frame0.html b/system/docshell/test/navigation/frame0.html
index 93d1c9c82..93d1c9c82 100644
--- a/docshell/test/navigation/frame0.html
+++ b/system/docshell/test/navigation/frame0.html
diff --git a/docshell/test/navigation/frame1.html b/system/docshell/test/navigation/frame1.html
index 4d06c09d1..4d06c09d1 100644
--- a/docshell/test/navigation/frame1.html
+++ b/system/docshell/test/navigation/frame1.html
diff --git a/docshell/test/navigation/frame2.html b/system/docshell/test/navigation/frame2.html
index 7a3b5e0b9..7a3b5e0b9 100644
--- a/docshell/test/navigation/frame2.html
+++ b/system/docshell/test/navigation/frame2.html
diff --git a/docshell/test/navigation/frame3.html b/system/docshell/test/navigation/frame3.html
index fd2429387..fd2429387 100644
--- a/docshell/test/navigation/frame3.html
+++ b/system/docshell/test/navigation/frame3.html
diff --git a/docshell/test/navigation/goback.html b/system/docshell/test/navigation/goback.html
index ce2968374..ce2968374 100644
--- a/docshell/test/navigation/goback.html
+++ b/system/docshell/test/navigation/goback.html
diff --git a/docshell/test/navigation/iframe.html b/system/docshell/test/navigation/iframe.html
index 4685fea7b..4685fea7b 100644
--- a/docshell/test/navigation/iframe.html
+++ b/system/docshell/test/navigation/iframe.html
diff --git a/docshell/test/navigation/mochitest.ini b/system/docshell/test/navigation/mochitest.ini
index e2ee307e4..e2ee307e4 100644
--- a/docshell/test/navigation/mochitest.ini
+++ b/system/docshell/test/navigation/mochitest.ini
diff --git a/docshell/test/navigation/navigate.html b/system/docshell/test/navigation/navigate.html
index e686da423..e686da423 100644
--- a/docshell/test/navigation/navigate.html
+++ b/system/docshell/test/navigation/navigate.html
diff --git a/docshell/test/navigation/navigation_target_popup_url.html b/system/docshell/test/navigation/navigation_target_popup_url.html
index cfe6de009..cfe6de009 100644
--- a/docshell/test/navigation/navigation_target_popup_url.html
+++ b/system/docshell/test/navigation/navigation_target_popup_url.html
diff --git a/docshell/test/navigation/navigation_target_url.html b/system/docshell/test/navigation/navigation_target_url.html
index a485e8133..a485e8133 100644
--- a/docshell/test/navigation/navigation_target_url.html
+++ b/system/docshell/test/navigation/navigation_target_url.html
diff --git a/docshell/test/navigation/open.html b/system/docshell/test/navigation/open.html
index 97eb9b76e..97eb9b76e 100644
--- a/docshell/test/navigation/open.html
+++ b/system/docshell/test/navigation/open.html
diff --git a/docshell/test/navigation/parent.html b/system/docshell/test/navigation/parent.html
index 74722b8bd..74722b8bd 100644
--- a/docshell/test/navigation/parent.html
+++ b/system/docshell/test/navigation/parent.html
diff --git a/docshell/test/navigation/test_bug13871.html b/system/docshell/test/navigation/test_bug13871.html
index e0b563a4a..e0b563a4a 100644
--- a/docshell/test/navigation/test_bug13871.html
+++ b/system/docshell/test/navigation/test_bug13871.html
diff --git a/docshell/test/navigation/test_bug270414.html b/system/docshell/test/navigation/test_bug270414.html
index 98dcf42f8..98dcf42f8 100644
--- a/docshell/test/navigation/test_bug270414.html
+++ b/system/docshell/test/navigation/test_bug270414.html
diff --git a/docshell/test/navigation/test_bug278916.html b/system/docshell/test/navigation/test_bug278916.html
index 3ad6a9666..3ad6a9666 100644
--- a/docshell/test/navigation/test_bug278916.html
+++ b/system/docshell/test/navigation/test_bug278916.html
diff --git a/docshell/test/navigation/test_bug279495.html b/system/docshell/test/navigation/test_bug279495.html
index 79a169567..79a169567 100644
--- a/docshell/test/navigation/test_bug279495.html
+++ b/system/docshell/test/navigation/test_bug279495.html
diff --git a/docshell/test/navigation/test_bug344861.html b/system/docshell/test/navigation/test_bug344861.html
index f9759751c..f9759751c 100644
--- a/docshell/test/navigation/test_bug344861.html
+++ b/system/docshell/test/navigation/test_bug344861.html
diff --git a/docshell/test/navigation/test_bug386782.html b/system/docshell/test/navigation/test_bug386782.html
index 2434963f1..2434963f1 100644
--- a/docshell/test/navigation/test_bug386782.html
+++ b/system/docshell/test/navigation/test_bug386782.html
diff --git a/docshell/test/navigation/test_bug430624.html b/system/docshell/test/navigation/test_bug430624.html
index 9fc92e4cd..9fc92e4cd 100644
--- a/docshell/test/navigation/test_bug430624.html
+++ b/system/docshell/test/navigation/test_bug430624.html
diff --git a/docshell/test/navigation/test_bug430723.html b/system/docshell/test/navigation/test_bug430723.html
index eb53e0d22..eb53e0d22 100644
--- a/docshell/test/navigation/test_bug430723.html
+++ b/system/docshell/test/navigation/test_bug430723.html
diff --git a/docshell/test/navigation/test_child.html b/system/docshell/test/navigation/test_child.html
index c43e1a6cf..c43e1a6cf 100644
--- a/docshell/test/navigation/test_child.html
+++ b/system/docshell/test/navigation/test_child.html
diff --git a/docshell/test/navigation/test_contentpolicy_block_window.html b/system/docshell/test/navigation/test_contentpolicy_block_window.html
index 651be825c..651be825c 100644
--- a/docshell/test/navigation/test_contentpolicy_block_window.html
+++ b/system/docshell/test/navigation/test_contentpolicy_block_window.html
diff --git a/docshell/test/navigation/test_grandchild.html b/system/docshell/test/navigation/test_grandchild.html
index 439145b3e..439145b3e 100644
--- a/docshell/test/navigation/test_grandchild.html
+++ b/system/docshell/test/navigation/test_grandchild.html
diff --git a/docshell/test/navigation/test_not-opener.html b/system/docshell/test/navigation/test_not-opener.html
index d778f71d9..d778f71d9 100644
--- a/docshell/test/navigation/test_not-opener.html
+++ b/system/docshell/test/navigation/test_not-opener.html
diff --git a/docshell/test/navigation/test_opener.html b/system/docshell/test/navigation/test_opener.html
index bfb1dde9f..bfb1dde9f 100644
--- a/docshell/test/navigation/test_opener.html
+++ b/system/docshell/test/navigation/test_opener.html
diff --git a/docshell/test/navigation/test_popup-navigates-children.html b/system/docshell/test/navigation/test_popup-navigates-children.html
index 692f35713..692f35713 100644
--- a/docshell/test/navigation/test_popup-navigates-children.html
+++ b/system/docshell/test/navigation/test_popup-navigates-children.html
diff --git a/docshell/test/navigation/test_reserved.html b/system/docshell/test/navigation/test_reserved.html
index b2389078c..b2389078c 100644
--- a/docshell/test/navigation/test_reserved.html
+++ b/system/docshell/test/navigation/test_reserved.html
diff --git a/docshell/test/navigation/test_sessionhistory.html b/system/docshell/test/navigation/test_sessionhistory.html
index e5978acfa..e5978acfa 100644
--- a/docshell/test/navigation/test_sessionhistory.html
+++ b/system/docshell/test/navigation/test_sessionhistory.html
diff --git a/docshell/test/navigation/test_sibling-matching-parent.html b/system/docshell/test/navigation/test_sibling-matching-parent.html
index dc8ec2f90..dc8ec2f90 100644
--- a/docshell/test/navigation/test_sibling-matching-parent.html
+++ b/system/docshell/test/navigation/test_sibling-matching-parent.html
diff --git a/docshell/test/navigation/test_sibling-off-domain.html b/system/docshell/test/navigation/test_sibling-off-domain.html
index ba7942798..ba7942798 100644
--- a/docshell/test/navigation/test_sibling-off-domain.html
+++ b/system/docshell/test/navigation/test_sibling-off-domain.html
diff --git a/docshell/test/navigation/test_triggeringprincipal_frame_nav.html b/system/docshell/test/navigation/test_triggeringprincipal_frame_nav.html
index f8f97c678..f8f97c678 100644
--- a/docshell/test/navigation/test_triggeringprincipal_frame_nav.html
+++ b/system/docshell/test/navigation/test_triggeringprincipal_frame_nav.html
diff --git a/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html b/system/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html
index cd6a9c056..cd6a9c056 100644
--- a/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html
+++ b/system/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html
diff --git a/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html b/system/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html
index 7cc6ee97d..7cc6ee97d 100644
--- a/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html
+++ b/system/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html
diff --git a/docshell/test/navigation/test_triggeringprincipal_window_open.html b/system/docshell/test/navigation/test_triggeringprincipal_window_open.html
index dbee21777..dbee21777 100644
--- a/docshell/test/navigation/test_triggeringprincipal_window_open.html
+++ b/system/docshell/test/navigation/test_triggeringprincipal_window_open.html
diff --git a/docshell/test/test_anchor_scroll_after_document_open.html b/system/docshell/test/test_anchor_scroll_after_document_open.html
index 93fa4615b..93fa4615b 100644
--- a/docshell/test/test_anchor_scroll_after_document_open.html
+++ b/system/docshell/test/test_anchor_scroll_after_document_open.html
diff --git a/docshell/test/test_bfcache_plus_hash.html b/system/docshell/test/test_bfcache_plus_hash.html
index 30c0b6b50..30c0b6b50 100644
--- a/docshell/test/test_bfcache_plus_hash.html
+++ b/system/docshell/test/test_bfcache_plus_hash.html
diff --git a/docshell/test/test_bug1045096.html b/system/docshell/test/test_bug1045096.html
index 8a0b4a223..8a0b4a223 100644
--- a/docshell/test/test_bug1045096.html
+++ b/system/docshell/test/test_bug1045096.html
diff --git a/docshell/test/test_bug1121701.html b/system/docshell/test/test_bug1121701.html
index 8beb2d8d0..8beb2d8d0 100644
--- a/docshell/test/test_bug1121701.html
+++ b/system/docshell/test/test_bug1121701.html
diff --git a/docshell/test/test_bug1151421.html b/system/docshell/test/test_bug1151421.html
index 76e34d502..76e34d502 100644
--- a/docshell/test/test_bug1151421.html
+++ b/system/docshell/test/test_bug1151421.html
diff --git a/docshell/test/test_bug1186774.html b/system/docshell/test/test_bug1186774.html
index 623e7996b..623e7996b 100644
--- a/docshell/test/test_bug1186774.html
+++ b/system/docshell/test/test_bug1186774.html
diff --git a/docshell/test/test_bug123696.html b/system/docshell/test/test_bug123696.html
index 11d14e807..11d14e807 100644
--- a/docshell/test/test_bug123696.html
+++ b/system/docshell/test/test_bug123696.html
diff --git a/docshell/test/test_bug369814.html b/system/docshell/test/test_bug369814.html
index 866771055..866771055 100644
--- a/docshell/test/test_bug369814.html
+++ b/system/docshell/test/test_bug369814.html
diff --git a/docshell/test/test_bug384014.html b/system/docshell/test/test_bug384014.html
index 1f115a6ec..1f115a6ec 100644
--- a/docshell/test/test_bug384014.html
+++ b/system/docshell/test/test_bug384014.html
diff --git a/docshell/test/test_bug385434.html b/system/docshell/test/test_bug385434.html
index 660f522e8..660f522e8 100644
--- a/docshell/test/test_bug385434.html
+++ b/system/docshell/test/test_bug385434.html
diff --git a/docshell/test/test_bug387979.html b/system/docshell/test/test_bug387979.html
index 9e337e2c2..9e337e2c2 100644
--- a/docshell/test/test_bug387979.html
+++ b/system/docshell/test/test_bug387979.html
diff --git a/docshell/test/test_bug402210.html b/system/docshell/test/test_bug402210.html
index 78fa025e0..78fa025e0 100644
--- a/docshell/test/test_bug402210.html
+++ b/system/docshell/test/test_bug402210.html
diff --git a/docshell/test/test_bug404548.html b/system/docshell/test/test_bug404548.html
index edde15c9d..edde15c9d 100644
--- a/docshell/test/test_bug404548.html
+++ b/system/docshell/test/test_bug404548.html
diff --git a/docshell/test/test_bug413310.html b/system/docshell/test/test_bug413310.html
index e030c99d8..e030c99d8 100644
--- a/docshell/test/test_bug413310.html
+++ b/system/docshell/test/test_bug413310.html
diff --git a/docshell/test/test_bug475636.html b/system/docshell/test/test_bug475636.html
index eaea3bcb8..eaea3bcb8 100644
--- a/docshell/test/test_bug475636.html
+++ b/system/docshell/test/test_bug475636.html
diff --git a/docshell/test/test_bug509055.html b/system/docshell/test/test_bug509055.html
index be163cafa..be163cafa 100644
--- a/docshell/test/test_bug509055.html
+++ b/system/docshell/test/test_bug509055.html
diff --git a/docshell/test/test_bug511449.html b/system/docshell/test/test_bug511449.html
index dcea4cf3d..dcea4cf3d 100644
--- a/docshell/test/test_bug511449.html
+++ b/system/docshell/test/test_bug511449.html
diff --git a/docshell/test/test_bug529119-1.html b/system/docshell/test/test_bug529119-1.html
index 573885dc0..573885dc0 100644
--- a/docshell/test/test_bug529119-1.html
+++ b/system/docshell/test/test_bug529119-1.html
diff --git a/docshell/test/test_bug529119-2.html b/system/docshell/test/test_bug529119-2.html
index fb3d19119..fb3d19119 100644
--- a/docshell/test/test_bug529119-2.html
+++ b/system/docshell/test/test_bug529119-2.html
diff --git a/docshell/test/test_bug530396.html b/system/docshell/test/test_bug530396.html
index f9fb79b4b..f9fb79b4b 100644
--- a/docshell/test/test_bug530396.html
+++ b/system/docshell/test/test_bug530396.html
diff --git a/docshell/test/test_bug540462.html b/system/docshell/test/test_bug540462.html
index 65447114f..65447114f 100644
--- a/docshell/test/test_bug540462.html
+++ b/system/docshell/test/test_bug540462.html
diff --git a/docshell/test/test_bug551225.html b/system/docshell/test/test_bug551225.html
index 00dc5e076..00dc5e076 100644
--- a/docshell/test/test_bug551225.html
+++ b/system/docshell/test/test_bug551225.html
diff --git a/docshell/test/test_bug570341.html b/system/docshell/test/test_bug570341.html
index d09afa4bd..d09afa4bd 100644
--- a/docshell/test/test_bug570341.html
+++ b/system/docshell/test/test_bug570341.html
diff --git a/docshell/test/test_bug580069.html b/system/docshell/test/test_bug580069.html
index 70d3b4a3e..70d3b4a3e 100644
--- a/docshell/test/test_bug580069.html
+++ b/system/docshell/test/test_bug580069.html
diff --git a/docshell/test/test_bug590573.html b/system/docshell/test/test_bug590573.html
index e218140ea..e218140ea 100644
--- a/docshell/test/test_bug590573.html
+++ b/system/docshell/test/test_bug590573.html
diff --git a/docshell/test/test_bug598895.html b/system/docshell/test/test_bug598895.html
index 5cc74e42c..5cc74e42c 100644
--- a/docshell/test/test_bug598895.html
+++ b/system/docshell/test/test_bug598895.html
diff --git a/docshell/test/test_bug634834.html b/system/docshell/test/test_bug634834.html
index 88f068518..88f068518 100644
--- a/docshell/test/test_bug634834.html
+++ b/system/docshell/test/test_bug634834.html
diff --git a/docshell/test/test_bug637644.html b/system/docshell/test/test_bug637644.html
index 4192fae22..4192fae22 100644
--- a/docshell/test/test_bug637644.html
+++ b/system/docshell/test/test_bug637644.html
diff --git a/docshell/test/test_bug640387_1.html b/system/docshell/test/test_bug640387_1.html
index e324787d4..e324787d4 100644
--- a/docshell/test/test_bug640387_1.html
+++ b/system/docshell/test/test_bug640387_1.html
diff --git a/docshell/test/test_bug640387_2.html b/system/docshell/test/test_bug640387_2.html
index 00c27fdda..00c27fdda 100644
--- a/docshell/test/test_bug640387_2.html
+++ b/system/docshell/test/test_bug640387_2.html
diff --git a/docshell/test/test_bug653741.html b/system/docshell/test/test_bug653741.html
index a1faf5e2d..a1faf5e2d 100644
--- a/docshell/test/test_bug653741.html
+++ b/system/docshell/test/test_bug653741.html
diff --git a/docshell/test/test_bug660404.html b/system/docshell/test/test_bug660404.html
index df45793a9..df45793a9 100644
--- a/docshell/test/test_bug660404.html
+++ b/system/docshell/test/test_bug660404.html
diff --git a/docshell/test/test_bug662170.html b/system/docshell/test/test_bug662170.html
index 0e626fed4..0e626fed4 100644
--- a/docshell/test/test_bug662170.html
+++ b/system/docshell/test/test_bug662170.html
diff --git a/docshell/test/test_bug668513.html b/system/docshell/test/test_bug668513.html
index 78df4b135..78df4b135 100644
--- a/docshell/test/test_bug668513.html
+++ b/system/docshell/test/test_bug668513.html
diff --git a/docshell/test/test_bug669671.html b/system/docshell/test/test_bug669671.html
index 6070ecc82..6070ecc82 100644
--- a/docshell/test/test_bug669671.html
+++ b/system/docshell/test/test_bug669671.html
diff --git a/docshell/test/test_bug675587.html b/system/docshell/test/test_bug675587.html
index 9a283d3ac..9a283d3ac 100644
--- a/docshell/test/test_bug675587.html
+++ b/system/docshell/test/test_bug675587.html
diff --git a/docshell/test/test_bug680257.html b/system/docshell/test/test_bug680257.html
index bf7c32d11..bf7c32d11 100644
--- a/docshell/test/test_bug680257.html
+++ b/system/docshell/test/test_bug680257.html
diff --git a/docshell/test/test_bug691547.html b/system/docshell/test/test_bug691547.html
index 9bf4f1004..9bf4f1004 100644
--- a/docshell/test/test_bug691547.html
+++ b/system/docshell/test/test_bug691547.html
diff --git a/docshell/test/test_bug694612.html b/system/docshell/test/test_bug694612.html
index 85c240146..85c240146 100644
--- a/docshell/test/test_bug694612.html
+++ b/system/docshell/test/test_bug694612.html
diff --git a/docshell/test/test_bug703855.html b/system/docshell/test/test_bug703855.html
index 0804f70bc..0804f70bc 100644
--- a/docshell/test/test_bug703855.html
+++ b/system/docshell/test/test_bug703855.html
diff --git a/docshell/test/test_bug713825.html b/system/docshell/test/test_bug713825.html
index 5f30dd0b6..5f30dd0b6 100644
--- a/docshell/test/test_bug713825.html
+++ b/system/docshell/test/test_bug713825.html
diff --git a/docshell/test/test_bug728939.html b/system/docshell/test/test_bug728939.html
index c29f18668..c29f18668 100644
--- a/docshell/test/test_bug728939.html
+++ b/system/docshell/test/test_bug728939.html
diff --git a/docshell/test/test_bug797909.html b/system/docshell/test/test_bug797909.html
index a47aa0c6d..a47aa0c6d 100644
--- a/docshell/test/test_bug797909.html
+++ b/system/docshell/test/test_bug797909.html
diff --git a/docshell/test/test_forceinheritprincipal_overrule_owner.html b/system/docshell/test/test_forceinheritprincipal_overrule_owner.html
index b3a48d7ea..b3a48d7ea 100644
--- a/docshell/test/test_forceinheritprincipal_overrule_owner.html
+++ b/system/docshell/test/test_forceinheritprincipal_overrule_owner.html
diff --git a/docshell/test/test_framedhistoryframes.html b/system/docshell/test/test_framedhistoryframes.html
index 916a6229d..916a6229d 100644
--- a/docshell/test/test_framedhistoryframes.html
+++ b/system/docshell/test/test_framedhistoryframes.html
diff --git a/docshell/test/test_pushState_after_document_open.html b/system/docshell/test/test_pushState_after_document_open.html
index 51ba1050c..51ba1050c 100644
--- a/docshell/test/test_pushState_after_document_open.html
+++ b/system/docshell/test/test_pushState_after_document_open.html
diff --git a/docshell/test/test_triggeringprincipal_location_seturi.html b/system/docshell/test/test_triggeringprincipal_location_seturi.html
index 3b0c7bac5..3b0c7bac5 100644
--- a/docshell/test/test_triggeringprincipal_location_seturi.html
+++ b/system/docshell/test/test_triggeringprincipal_location_seturi.html
diff --git a/docshell/test/test_windowedhistoryframes.html b/system/docshell/test/test_windowedhistoryframes.html
index d27987beb..d27987beb 100644
--- a/docshell/test/test_windowedhistoryframes.html
+++ b/system/docshell/test/test_windowedhistoryframes.html
diff --git a/docshell/test/unit/head_docshell.js b/system/docshell/test/unit/head_docshell.js
index a5c7546c0..a5c7546c0 100644
--- a/docshell/test/unit/head_docshell.js
+++ b/system/docshell/test/unit/head_docshell.js
diff --git a/docshell/test/unit/test_bug414201_jfif.js b/system/docshell/test/unit/test_bug414201_jfif.js
index 6a689ec08..6a689ec08 100644
--- a/docshell/test/unit/test_bug414201_jfif.js
+++ b/system/docshell/test/unit/test_bug414201_jfif.js
diff --git a/docshell/test/unit/test_bug442584.js b/system/docshell/test/unit/test_bug442584.js
index 174bdb7e3..174bdb7e3 100644
--- a/docshell/test/unit/test_bug442584.js
+++ b/system/docshell/test/unit/test_bug442584.js
diff --git a/docshell/test/unit/test_nsDefaultURIFixup.js b/system/docshell/test/unit/test_nsDefaultURIFixup.js
index 371bdea17..371bdea17 100644
--- a/docshell/test/unit/test_nsDefaultURIFixup.js
+++ b/system/docshell/test/unit/test_nsDefaultURIFixup.js
diff --git a/docshell/test/unit/test_nsDefaultURIFixup_info.js b/system/docshell/test/unit/test_nsDefaultURIFixup_info.js
index 748aaab93..748aaab93 100644
--- a/docshell/test/unit/test_nsDefaultURIFixup_info.js
+++ b/system/docshell/test/unit/test_nsDefaultURIFixup_info.js
diff --git a/docshell/test/unit/test_nsDefaultURIFixup_search.js b/system/docshell/test/unit/test_nsDefaultURIFixup_search.js
index c84452b5d..c84452b5d 100644
--- a/docshell/test/unit/test_nsDefaultURIFixup_search.js
+++ b/system/docshell/test/unit/test_nsDefaultURIFixup_search.js
diff --git a/docshell/test/unit/test_nsIDownloadHistory.js b/system/docshell/test/unit/test_nsIDownloadHistory.js
index 2030f0702..2030f0702 100644
--- a/docshell/test/unit/test_nsIDownloadHistory.js
+++ b/system/docshell/test/unit/test_nsIDownloadHistory.js
diff --git a/docshell/test/unit/test_pb_notification.js b/system/docshell/test/unit/test_pb_notification.js
index 82018f585..82018f585 100644
--- a/docshell/test/unit/test_pb_notification.js
+++ b/system/docshell/test/unit/test_pb_notification.js
diff --git a/docshell/test/unit/test_privacy_transition.js b/system/docshell/test/unit/test_privacy_transition.js
index 829e25c3c..829e25c3c 100644
--- a/docshell/test/unit/test_privacy_transition.js
+++ b/system/docshell/test/unit/test_privacy_transition.js
diff --git a/docshell/test/unit/test_setUsePrivateBrowsing.js b/system/docshell/test/unit/test_setUsePrivateBrowsing.js
index 739186895..739186895 100644
--- a/docshell/test/unit/test_setUsePrivateBrowsing.js
+++ b/system/docshell/test/unit/test_setUsePrivateBrowsing.js
diff --git a/docshell/test/unit/xpcshell.ini b/system/docshell/test/unit/xpcshell.ini
index ce8ec8b63..ce8ec8b63 100644
--- a/docshell/test/unit/xpcshell.ini
+++ b/system/docshell/test/unit/xpcshell.ini
diff --git a/docshell/test/unit_ipc/test_pb_notification_ipc.js b/system/docshell/test/unit_ipc/test_pb_notification_ipc.js
index 1517a479f..1517a479f 100644
--- a/docshell/test/unit_ipc/test_pb_notification_ipc.js
+++ b/system/docshell/test/unit_ipc/test_pb_notification_ipc.js
diff --git a/docshell/test/unit_ipc/xpcshell.ini b/system/docshell/test/unit_ipc/xpcshell.ini
index 7a2df27c0..7a2df27c0 100644
--- a/docshell/test/unit_ipc/xpcshell.ini
+++ b/system/docshell/test/unit_ipc/xpcshell.ini
diff --git a/system/moz.build b/system/moz.build
index bbba78a7f..e6dece83b 100644
--- a/system/moz.build
+++ b/system/moz.build
@@ -3,4 +3,5 @@
 # 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 += ['docshell']
 FINAL_TARGET_PP_FILES += ['goanna.js']
 \ No newline at end of file
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index 0c16dbfac..04875ab9d 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -64,7 +64,6 @@ DIRS += [
     '/widget',
     '/editor',
     '/layout',
-    '/docshell',
     '/embedding',
 ]
 
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 0f271dc5b..843cdcba8 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -5,7 +5,7 @@ include ../../testing/crashtest/sanity/crashtests.list
 
 include ../../accessible/tests/crashtests/crashtests.list
 
-include ../../docshell/base/crashtests/crashtests.list
+include ../../system/docshell/base/crashtests/crashtests.list
 
 include ../../dom/animation/test/crashtests/crashtests.list
 include ../../dom/audiochannel/crashtests/crashtests.list
diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
index da3828c6d..b579a3b3d 100644
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -81,7 +81,7 @@ LOCAL_INCLUDES += [
     '../reflect/xptinfo',
     '../threads',
     '/components/registry/src',
-    '/docshell/base',
+    '/system/docshell/base',
 ]
 
 if CONFIG['MOZ_VPX']:
author	Matt A. Tobin <email@mattatobin.com>	2021-11-22 11:41:22 -0500
committer	Matt A. Tobin <email@mattatobin.com>	2021-11-22 11:41:22 -0500
commit	7572f6fb227f67f5f820019fe8afa899aa700862 (patch)
tree	33e53aa11ae6107f5048f313a0e7b1e748baad0f
parent	3bcef0ff65fa2ab6a482543afd1b1e00dd31cfee (diff)
download	aura-central-7572f6fb227f67f5f820019fe8afa899aa700862.tar.gz