diff --git a/browser/components/places/tests/browser/browser_bookmark_titles.js b/browser/components/places/tests/browser/browser_bookmark_titles.js index c2a363b8095c..50d1e7a39fba 100644 --- a/browser/components/places/tests/browser/browser_bookmark_titles.js +++ b/browser/components/places/tests/browser/browser_bookmark_titles.js @@ -20,8 +20,8 @@ var tests = [ }, // about:neterror { - url: "data:application/vnd.mozilla.xul+xml,", - title: "data:application/vnd.mozilla.xul+xml,", + url: "data:application/xhtml+xml,", + title: "data:application/xhtml+xml,", isError: true, }, // about:certerror diff --git a/chrome/test/unit/data/test_data_protocol_registration.manifest b/chrome/test/unit/data/test_data_protocol_registration.manifest index 4effa6ee6500..ceaa80c5095b 100644 --- a/chrome/test/unit/data/test_data_protocol_registration.manifest +++ b/chrome/test/unit/data/test_data_protocol_registration.manifest @@ -2,4 +2,4 @@ content good-package bar/ # Local resource (should work) -override chrome://good-package/content/test.xul data:application/vnd.mozilla.xul+xml, +override chrome://good-package/content/test.xul data:application/xhtml+xml, diff --git a/chrome/test/unit/test_data_protocol_registration.js b/chrome/test/unit/test_data_protocol_registration.js index c129ff2fdc06..5e2dd8cbb6f1 100644 --- a/chrome/test/unit/test_data_protocol_registration.js +++ b/chrome/test/unit/test_data_protocol_registration.js @@ -89,7 +89,7 @@ function run_test() { cr.checkForNewChrome(); // Check that our override worked - let expectedURI = "data:application/vnd.mozilla.xul+xml,"; + let expectedURI = "data:application/xhtml+xml,"; let sourceURI = "chrome://good-package/content/test.xul"; try { sourceURI = Services.io.newURI(sourceURI); diff --git a/devtools/shared/webconsole/network-helper.js b/devtools/shared/webconsole/network-helper.js index fd02405aece9..23ebbd18c727 100644 --- a/devtools/shared/webconsole/network-helper.js +++ b/devtools/shared/webconsole/network-helper.js @@ -440,7 +440,6 @@ var NetworkHelper = { "application/atom+xml": "xml", "application/rss+xml": "xml", "application/vnd.mozilla.maybe.feed": "xml", - "application/vnd.mozilla.xul+xml": "xml", "application/javascript": "js", "application/x-javascript": "js", "application/x-httpd-php": "txt", diff --git a/docshell/test/chrome/test_bug565388.xhtml b/docshell/test/chrome/test_bug565388.xhtml index 76b3745ffa91..9a38a152d02b 100644 --- a/docshell/test/chrome/test_bug565388.xhtml +++ b/docshell/test/chrome/test_bug565388.xhtml @@ -60,12 +60,12 @@ function test() { var win = docShell.contentViewer.DOMDocument.defaultView; progressListener.add(docShell, function(){ - is(win.document.documentURI, "data:application/vnd.mozilla.xul+xml;charset=utf-8,"); + is(win.document.documentURI, "data:application/xhtml+xml;charset=utf-8,"); webNav.close(); SimpleTest.finish(); }); - win.location = "data:application/vnd.mozilla.xul+xml;charset=utf-8,"; + win.location = "data:application/xhtml+xml;charset=utf-8,"; } addLoadEvent(function onLoad() { diff --git a/docshell/test/chrome/test_principalInherit.xhtml b/docshell/test/chrome/test_principalInherit.xhtml index 5745d1e062a7..da010e2f989b 100644 --- a/docshell/test/chrome/test_principalInherit.xhtml +++ b/docshell/test/chrome/test_principalInherit.xhtml @@ -59,7 +59,7 @@ var tests = [ // same-type parent. // Load a javascript: URI in it to ensure that GetInheritedPrincipal will // force creation of a content viewer. - let xulWinURL = 'data:application/vnd.mozilla.xul+xml,' + + let xulWinURL = 'data:application/xhtml+xml,' + ''; let newWin = docShell.rootTreeItem.domWindow.openDialog(xulWinURL, "chrome_window", "chrome"); loadListener(newWin, function () { diff --git a/dom/base/test/test_bug431082.html b/dom/base/test/test_bug431082.html index 60706e61467d..aee6711f2906 100644 --- a/dom/base/test/test_bug431082.html +++ b/dom/base/test/test_bug431082.html @@ -45,7 +45,7 @@ setTimeout(doe,0); --> - + diff --git a/layout/style/crashtests/404470-1.html b/layout/style/crashtests/404470-1.html index 481ba4233b01..03cac228f4cc 100644 --- a/layout/style/crashtests/404470-1.html +++ b/layout/style/crashtests/404470-1.html @@ -6,7 +6,7 @@ function boom() { var iframe = document.createElement("iframe"); document.body.appendChild(iframe); - iframe.setAttribute("src", 'data:application/vnd.mozilla.xul+xml, diff --git a/layout/xul/crashtests/378961.html b/layout/xul/crashtests/378961.html index b4da857ff3d9..42e9a64bd82a 100644 --- a/layout/xul/crashtests/378961.html +++ b/layout/xul/crashtests/378961.html @@ -3,7 +3,7 @@ Testcase bug 378961 - Crash [@ nsSplitterFrameInner::RemoveListener] when dragging splitter and DOMAttrModified event removing window - + diff --git a/layout/xul/crashtests/381862.html b/layout/xul/crashtests/381862.html index e26fa357e7e2..65721d1a3fb1 100644 --- a/layout/xul/crashtests/381862.html +++ b/layout/xul/crashtests/381862.html @@ -2,7 +2,7 @@ Testcase bug - Crash [@ nsBoxFrame::BuildDisplayListForChildren] with tree stuff in iframe toggling display - +