diff --git a/docshell/base/crashtests/403574-1.xhtml b/docshell/base/crashtests/403574-1.xhtml
deleted file mode 100644
index cdf7d43a4b..0000000000
--- a/docshell/base/crashtests/403574-1.xhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docshell/base/crashtests/crashtests.list b/docshell/base/crashtests/crashtests.list
index a905bc18a8..63da4fef3a 100644
--- a/docshell/base/crashtests/crashtests.list
+++ b/docshell/base/crashtests/crashtests.list
@@ -1,6 +1,5 @@
load 40929-1.html
load 369126-1.html
-load 403574-1.xhtml
load 430124-1.html
load 430628-1.html
load 432114-1.html
diff --git a/docshell/base/moz.build b/docshell/base/moz.build
index 068ec34e72..334d301cb8 100644
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -116,6 +116,3 @@ LOCAL_INCLUDES += [
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
-
-if CONFIG['MOZ_LAYOUT_DEBUGGER']:
- DEFINES['MOZ_LAYOUT_DEBUGGER'] = True
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index 680040ba45..ac88941b22 100644
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -63,14 +63,14 @@ class CrashChannel final : public nsBaseChannel {
*/
static const RedirEntry kRedirMap[] = {
{"about", "chrome://global/content/aboutAbout.xhtml", 0},
- {"addons", "chrome://mozapps/content/extensions/extensions.xul",
+ {"addons", "chrome://mozapps/content/extensions/extensions.xhtml",
nsIAboutModule::ALLOW_SCRIPT},
{"buildconfig", "chrome://global/content/buildconfig.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
{"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT},
- {"config", "chrome://global/content/config.xul", 0},
+ {"config", "chrome://global/content/config.xhtml", 0},
#ifdef MOZ_CRASHREPORTER
{"crashes", "chrome://global/content/crashes.xhtml", 0},
#endif
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index ec7d550293..39a221ab98 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5190,7 +5190,7 @@ nsDocShell::SetParentNativeWindow(nativeWindow aParentNativeWindow) {
NS_IMETHODIMP
nsDocShell::GetNativeHandle(nsAString& aNativeHandle) {
- // the nativeHandle should be accessed from nsIXULWindow
+ // the nativeHandle should be accessed from nsIAppWindow
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -9417,18 +9417,6 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
!StaticPrefs::extensions_webextensions_remote()) {
break;
}
-#ifdef MOZ_LAYOUT_DEBUGGER
- // Also allow loads in the layout debugger window.
- nsCOMPtr rootItem;
- GetRootTreeItem(getter_AddRefs(rootItem));
- nsCOMPtr root = do_QueryInterface(rootItem);
- nsCOMPtr rootURL;
- root->GetCurrentURI(getter_AddRefs(rootURL));
- if (rootURL && rootURL->GetSpecOrDefault().EqualsLiteral(
- "chrome://layoutdebug/content/layoutdebug.xul")) {
- break;
- }
-#endif
// Final exception for some legacy automated tests:
if (xpc::IsInAutomation() &&
Preferences::GetBool("security.allow_unsafe_parent_loads", false)) {
diff --git a/docshell/base/nsDocShellTreeOwner.cpp b/docshell/base/nsDocShellTreeOwner.cpp
index a197484be6..6313fa352b 100644
--- a/docshell/base/nsDocShellTreeOwner.cpp
+++ b/docshell/base/nsDocShellTreeOwner.cpp
@@ -353,7 +353,7 @@ nsDocShellTreeOwner::SizeShellTo(nsIDocShellTreeItem* aShellItem, int32_t aCX,
if (browserChild) {
// The XUL window to resize is in the parent process, but there we
// won't be able to get aShellItem to do the hack in
- // nsXULWindow::SizeShellTo, so let's send the width and height of
+ // AppWindow::SizeShellTo, so let's send the width and height of
// aShellItem too.
nsCOMPtr shellAsWin(do_QueryInterface(aShellItem));
NS_ENSURE_TRUE(shellAsWin, NS_ERROR_FAILURE);
@@ -581,7 +581,7 @@ nsDocShellTreeOwner::SetParentNativeWindow(nativeWindow aParentNativeWindow) {
NS_IMETHODIMP
nsDocShellTreeOwner::GetNativeHandle(nsAString& aNativeHandle) {
- // the nativeHandle should be accessed from nsIXULWindow
+ // the nativeHandle should be accessed from nsIAppWindow
return NS_ERROR_NOT_IMPLEMENTED;
}
diff --git a/docshell/resources/content/netError.xhtml b/docshell/resources/content/netError.xhtml
index ba4ceb5d42..943b9c0790 100644
--- a/docshell/resources/content/netError.xhtml
+++ b/docshell/resources/content/netError.xhtml
@@ -22,7 +22,7 @@
-
+
&loadError.label;
-
- Test for Bug 829383
-
-
-
-
-Mozilla Bug 829383
-
-
-
-
-
-
-
-
-
-
diff --git a/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul b/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml
similarity index 100%
rename from docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
rename to docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml
diff --git a/docshell/test/chrome/window.template.txt b/docshell/test/chrome/window.template.txt
index f572806f69..4c520dc075 100644
--- a/docshell/test/chrome/window.template.txt
+++ b/docshell/test/chrome/window.template.txt
@@ -30,7 +30,7 @@
//
function testIterator()
{
- // Test steps go here. See bug303267_window.xul for an example.
+ // Test steps go here. See bug303267_window.xhtml for an example.
// Tell the framework the test is finished. Include the final 'yield'
// statement to prevent a StopIteration exception from being thrown.
diff --git a/docshell/test/navigation/browser_test-content-chromeflags.js b/docshell/test/navigation/browser_test-content-chromeflags.js
index 281295ce27..a12a092c8c 100644
--- a/docshell/test/navigation/browser_test-content-chromeflags.js
+++ b/docshell/test/navigation/browser_test-content-chromeflags.js
@@ -30,7 +30,7 @@ add_task(async function() {
let chromeFlags = win.docShell.treeOwner
.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIXULWindow).chromeFlags;
+ .getInterface(Ci.nsIAppWindow).chromeFlags;
// In the multi-process case, the new window will have the
// CHROME_REMOTE_WINDOW flag set.