Backed out changeset 40546d0aab39 (bug 1596328) for causing an ESlint failure CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Fri, 15 Nov 2019 05:08:52 +0200
changeset 502101 46348d491bc2337bb5c46a5dc4e5c674feb49604
parent 502100 40546d0aab39bc49cd3505aedf46ce4ed67595e6
child 502102 2a6684436b37e2dff61a160105790e0a44d1c655
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1596328
milestone72.0a1
backs out40546d0aab39bc49cd3505aedf46ce4ed67595e6
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 40546d0aab39 (bug 1596328) for causing an ESlint failure CLOSED TREE
docshell/test/chrome/bug112564_window.xhtml
docshell/test/chrome/bug112564_window.xul
docshell/test/chrome/bug113934_window.xhtml
docshell/test/chrome/bug113934_window.xul
docshell/test/chrome/bug215405_window.xhtml
docshell/test/chrome/bug215405_window.xul
docshell/test/chrome/bug293235_window.xhtml
docshell/test/chrome/bug293235_window.xul
docshell/test/chrome/bug294258_window.xhtml
docshell/test/chrome/bug294258_window.xul
docshell/test/chrome/bug298622_window.xhtml
docshell/test/chrome/bug298622_window.xul
docshell/test/chrome/bug301397_window.xhtml
docshell/test/chrome/bug301397_window.xul
docshell/test/chrome/bug303267_window.xhtml
docshell/test/chrome/bug303267_window.xul
docshell/test/chrome/bug311007_window.xhtml
docshell/test/chrome/bug311007_window.xul
docshell/test/chrome/bug321671_window.xhtml
docshell/test/chrome/bug321671_window.xul
docshell/test/chrome/bug360511_window.xhtml
docshell/test/chrome/bug360511_window.xul
docshell/test/chrome/bug364461_window.xhtml
docshell/test/chrome/bug364461_window.xul
docshell/test/chrome/bug396519_window.xhtml
docshell/test/chrome/bug396519_window.xul
docshell/test/chrome/bug396649_window.xhtml
docshell/test/chrome/bug396649_window.xul
docshell/test/chrome/bug449778_window.xhtml
docshell/test/chrome/bug449778_window.xul
docshell/test/chrome/bug449780_window.xhtml
docshell/test/chrome/bug449780_window.xul
docshell/test/chrome/bug454235-subframe.xhtml
docshell/test/chrome/bug454235-subframe.xul
docshell/test/chrome/bug582176_window.xhtml
docshell/test/chrome/bug582176_window.xul
docshell/test/chrome/bug608669.xhtml
docshell/test/chrome/bug608669.xul
docshell/test/chrome/bug662200_window.xhtml
docshell/test/chrome/bug662200_window.xul
docshell/test/chrome/bug690056_window.xhtml
docshell/test/chrome/bug690056_window.xul
docshell/test/chrome/bug89419_window.xhtml
docshell/test/chrome/bug89419_window.xul
docshell/test/chrome/bug92598_window.xhtml
docshell/test/chrome/bug92598_window.xul
docshell/test/chrome/chrome.ini
docshell/test/chrome/gen_template.pl
docshell/test/chrome/mozFrameType_window.xhtml
docshell/test/chrome/mozFrameType_window.xul
docshell/test/chrome/test_bug112564.xhtml
docshell/test/chrome/test_bug112564.xul
docshell/test/chrome/test_bug113934.xhtml
docshell/test/chrome/test_bug113934.xul
docshell/test/chrome/test_bug215405.xhtml
docshell/test/chrome/test_bug215405.xul
docshell/test/chrome/test_bug293235.xhtml
docshell/test/chrome/test_bug293235.xul
docshell/test/chrome/test_bug294258.xhtml
docshell/test/chrome/test_bug294258.xul
docshell/test/chrome/test_bug298622.xhtml
docshell/test/chrome/test_bug298622.xul
docshell/test/chrome/test_bug301397.xhtml
docshell/test/chrome/test_bug301397.xul
docshell/test/chrome/test_bug303267.xhtml
docshell/test/chrome/test_bug303267.xul
docshell/test/chrome/test_bug311007.xhtml
docshell/test/chrome/test_bug311007.xul
docshell/test/chrome/test_bug321671.xhtml
docshell/test/chrome/test_bug321671.xul
docshell/test/chrome/test_bug360511.xhtml
docshell/test/chrome/test_bug360511.xul
docshell/test/chrome/test_bug364461.xhtml
docshell/test/chrome/test_bug364461.xul
docshell/test/chrome/test_bug396519.xhtml
docshell/test/chrome/test_bug396519.xul
docshell/test/chrome/test_bug396649.xhtml
docshell/test/chrome/test_bug396649.xul
docshell/test/chrome/test_bug449778.xhtml
docshell/test/chrome/test_bug449778.xul
docshell/test/chrome/test_bug449780.xhtml
docshell/test/chrome/test_bug449780.xul
docshell/test/chrome/test_bug453650.xhtml
docshell/test/chrome/test_bug453650.xul
docshell/test/chrome/test_bug454235.xhtml
docshell/test/chrome/test_bug454235.xul
docshell/test/chrome/test_bug456980.xhtml
docshell/test/chrome/test_bug456980.xul
docshell/test/chrome/test_bug565388.xhtml
docshell/test/chrome/test_bug565388.xul
docshell/test/chrome/test_bug582176.xhtml
docshell/test/chrome/test_bug582176.xul
docshell/test/chrome/test_bug608669.xhtml
docshell/test/chrome/test_bug608669.xul
docshell/test/chrome/test_bug662200.xhtml
docshell/test/chrome/test_bug662200.xul
docshell/test/chrome/test_bug690056.xhtml
docshell/test/chrome/test_bug690056.xul
docshell/test/chrome/test_bug789773.xhtml
docshell/test/chrome/test_bug789773.xul
docshell/test/chrome/test_bug846906.xhtml
docshell/test/chrome/test_bug846906.xul
docshell/test/chrome/test_bug89419.xhtml
docshell/test/chrome/test_bug89419.xul
docshell/test/chrome/test_bug92598.xhtml
docshell/test/chrome/test_bug92598.xul
docshell/test/chrome/test_docRedirect.xhtml
docshell/test/chrome/test_docRedirect.xul
docshell/test/chrome/test_mozFrameType.xhtml
docshell/test/chrome/test_mozFrameType.xul
docshell/test/chrome/test_principalInherit.xhtml
docshell/test/chrome/test_principalInherit.xul
docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml
docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
docshell/test/chrome/window.template.txt
rename from docshell/test/chrome/bug112564_window.xhtml
rename to docshell/test/chrome/bug112564_window.xul
rename from docshell/test/chrome/bug113934_window.xhtml
rename to docshell/test/chrome/bug113934_window.xul
rename from docshell/test/chrome/bug215405_window.xhtml
rename to docshell/test/chrome/bug215405_window.xul
rename from docshell/test/chrome/bug293235_window.xhtml
rename to docshell/test/chrome/bug293235_window.xul
rename from docshell/test/chrome/bug294258_window.xhtml
rename to docshell/test/chrome/bug294258_window.xul
rename from docshell/test/chrome/bug298622_window.xhtml
rename to docshell/test/chrome/bug298622_window.xul
rename from docshell/test/chrome/bug301397_window.xhtml
rename to docshell/test/chrome/bug301397_window.xul
rename from docshell/test/chrome/bug303267_window.xhtml
rename to docshell/test/chrome/bug303267_window.xul
rename from docshell/test/chrome/bug311007_window.xhtml
rename to docshell/test/chrome/bug311007_window.xul
rename from docshell/test/chrome/bug321671_window.xhtml
rename to docshell/test/chrome/bug321671_window.xul
rename from docshell/test/chrome/bug360511_window.xhtml
rename to docshell/test/chrome/bug360511_window.xul
rename from docshell/test/chrome/bug364461_window.xhtml
rename to docshell/test/chrome/bug364461_window.xul
rename from docshell/test/chrome/bug396519_window.xhtml
rename to docshell/test/chrome/bug396519_window.xul
rename from docshell/test/chrome/bug396649_window.xhtml
rename to docshell/test/chrome/bug396649_window.xul
rename from docshell/test/chrome/bug449778_window.xhtml
rename to docshell/test/chrome/bug449778_window.xul
rename from docshell/test/chrome/bug449780_window.xhtml
rename to docshell/test/chrome/bug449780_window.xul
rename from docshell/test/chrome/bug454235-subframe.xhtml
rename to docshell/test/chrome/bug454235-subframe.xul
rename from docshell/test/chrome/bug582176_window.xhtml
rename to docshell/test/chrome/bug582176_window.xul
rename from docshell/test/chrome/bug608669.xhtml
rename to docshell/test/chrome/bug608669.xul
rename from docshell/test/chrome/bug662200_window.xhtml
rename to docshell/test/chrome/bug662200_window.xul
rename from docshell/test/chrome/bug690056_window.xhtml
rename to docshell/test/chrome/bug690056_window.xul
rename from docshell/test/chrome/bug89419_window.xhtml
rename to docshell/test/chrome/bug89419_window.xul
rename from docshell/test/chrome/bug92598_window.xhtml
rename to docshell/test/chrome/bug92598_window.xul
--- a/docshell/test/chrome/chrome.ini
+++ b/docshell/test/chrome/chrome.ini
@@ -1,90 +1,90 @@
 [DEFAULT]
 skip-if = os == 'android'
 support-files =
   662200a.html
   662200b.html
   662200c.html
   89419.html
   92598_nostore.html
-  bug112564_window.xhtml
-  bug113934_window.xhtml
-  bug215405_window.xhtml
+  bug112564_window.xul
+  bug113934_window.xul
+  bug215405_window.xul
   bug293235.html
   bug293235_p2.html
-  bug293235_window.xhtml
+  bug293235_window.xul
   bug294258_testcase.html
-  bug294258_window.xhtml
-  bug298622_window.xhtml
+  bug294258_window.xul
+  bug298622_window.xul
   bug301397_1.html
   bug301397_2.html
   bug301397_3.html
   bug301397_4.html
-  bug301397_window.xhtml
+  bug301397_window.xul
   bug303267.html
-  bug303267_window.xhtml
-  bug311007_window.xhtml
-  bug321671_window.xhtml
+  bug303267_window.xul
+  bug311007_window.xul
+  bug321671_window.xul
   bug360511_case1.html
   bug360511_case2.html
-  bug360511_window.xhtml
-  bug364461_window.xhtml
-  bug396519_window.xhtml
-  bug396649_window.xhtml
-  bug449778_window.xhtml
-  bug449780_window.xhtml
-  bug454235-subframe.xhtml
-  bug582176_window.xhtml
-  bug608669.xhtml
-  bug662200_window.xhtml
-  bug690056_window.xhtml
+  bug360511_window.xul
+  bug364461_window.xul
+  bug396519_window.xul
+  bug396649_window.xul
+  bug449778_window.xul
+  bug449780_window.xul
+  bug454235-subframe.xul
+  bug582176_window.xul
+  bug608669.xul
+  bug662200_window.xul
+  bug690056_window.xul
   bug846906.html
-  bug89419_window.xhtml
+  bug89419_window.xul
   bug909218.html
   bug909218.js
-  bug92598_window.xhtml
+  bug92598_window.xul
   docshell_helpers.js
   file_viewsource_forbidden_in_iframe.html
   generic.html
-  mozFrameType_window.xhtml
+  mozFrameType_window.xul
   test_docRedirect.sjs
 
 [test_allowContentRetargeting.html]
-[test_bug112564.xhtml]
-[test_bug113934.xhtml]
-[test_bug215405.xhtml]
-[test_bug293235.xhtml]
+[test_bug112564.xul]
+[test_bug113934.xul]
+[test_bug215405.xul]
+[test_bug293235.xul]
 skip-if = true # bug 1393441
-[test_bug294258.xhtml]
-[test_bug298622.xhtml]
-[test_bug301397.xhtml]
+[test_bug294258.xul]
+[test_bug298622.xul]
+[test_bug301397.xul]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1533819
-[test_bug303267.xhtml]
-[test_bug311007.xhtml]
-[test_bug321671.xhtml]
-[test_bug360511.xhtml]
-[test_bug364461.xhtml]
+[test_bug303267.xul]
+[test_bug311007.xul]
+[test_bug321671.xul]
+[test_bug360511.xul]
+[test_bug364461.xul]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1533814
-[test_bug396519.xhtml]
-[test_bug396649.xhtml]
+[test_bug396519.xul]
+[test_bug396649.xul]
 [test_bug428288.html]
-[test_bug449778.xhtml]
-[test_bug449780.xhtml]
-[test_bug453650.xhtml]
-[test_bug454235.xhtml]
-[test_bug456980.xhtml]
-[test_bug565388.xhtml]
+[test_bug449778.xul]
+[test_bug449780.xul]
+[test_bug453650.xul]
+[test_bug454235.xul]
+[test_bug456980.xul]
+[test_bug565388.xul]
 skip-if = true # Bug 1026815,Bug 1546159
-[test_bug582176.xhtml]
-[test_bug608669.xhtml]
-[test_bug662200.xhtml]
-[test_bug690056.xhtml]
-[test_bug789773.xhtml]
-[test_bug846906.xhtml]
-[test_bug89419.xhtml]
+[test_bug582176.xul]
+[test_bug608669.xul]
+[test_bug662200.xul]
+[test_bug690056.xul]
+[test_bug789773.xul]
+[test_bug846906.xul]
+[test_bug89419.xul]
 [test_bug909218.html]
-[test_bug92598.xhtml]
-[test_mozFrameType.xhtml]
-[test_principalInherit.xhtml]
-[test_viewsource_forbidden_in_iframe.xhtml]
+[test_bug92598.xul]
+[test_mozFrameType.xul]
+[test_principalInherit.xul]
+[test_viewsource_forbidden_in_iframe.xul]
 skip-if = true # bug 1019315
-[test_docRedirect.xhtml]
+[test_docRedirect.xul]
--- a/docshell/test/chrome/gen_template.pl
+++ b/docshell/test/chrome/gen_template.pl
@@ -3,37 +3,37 @@
 # This script makes docshell test case templates. It takes one argument:
 #
 #   -b: a bugnumber
 #
 # For example, this command:
 #
 #   perl gen_template.pl -b 303267
 #
-# Writes test case template files test_bug303267.xhtml and bug303267_window.xhtml
+# Writes test case template files test_bug303267.xul and bug303267_window.xul
 # to the current directory.
 
 use FindBin;
 use Getopt::Long;
 GetOptions("b=i"=> \$bug_number);
 
 $template = "$FindBin::RealBin/test.template.txt";
 
 open(IN,$template) or die("Failed to open input file for reading.");
-open(OUT, ">>test_bug" . $bug_number . ".xhtml") or die("Failed to open output file for appending.");
+open(OUT, ">>test_bug" . $bug_number . ".xul") or die("Failed to open output file for appending.");
 while((defined(IN)) && ($line = <IN>)) {
         $line =~ s/{BUGNUMBER}/$bug_number/g;
         print OUT $line;
 }
 close(IN);
 close(OUT);
 
 $template = "$FindBin::RealBin/window.template.txt";
 
 open(IN,$template) or die("Failed to open input file for reading.");
-open(OUT, ">>bug" . $bug_number . "_window.xhtml") or die("Failed to open output file for appending.");
+open(OUT, ">>bug" . $bug_number . "_window.xul") or die("Failed to open output file for appending.");
 while((defined(IN)) && ($line = <IN>)) {
         $line =~ s/{BUGNUMBER}/$bug_number/g;
         print OUT $line;
 }
 close(IN);
 close(OUT);
 
rename from docshell/test/chrome/mozFrameType_window.xhtml
rename to docshell/test/chrome/mozFrameType_window.xul
rename from docshell/test/chrome/test_bug112564.xhtml
rename to docshell/test/chrome/test_bug112564.xul
--- a/docshell/test/chrome/test_bug112564.xhtml
+++ b/docshell/test/chrome/test_bug112564.xul
@@ -23,15 +23,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 112564 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug112564_window.xhtml", "bug112564",
+window.openDialog("bug112564_window.xul", "bug112564",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug113934.xhtml
rename to docshell/test/chrome/test_bug113934.xul
--- a/docshell/test/chrome/test_bug113934.xhtml
+++ b/docshell/test/chrome/test_bug113934.xul
@@ -16,14 +16,14 @@ https://bugzilla.mozilla.org/show_bug.cg
      target="_blank">Mozilla Bug 396519</a>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
     SimpleTest.waitForExplicitFinish();
 
     addLoadEvent(function() {
-      window.openDialog("bug113934_window.xhtml?content", "bug113934",
+      window.openDialog("bug113934_window.xul?content", "bug113934",
                         "chrome,width=800,height=800,noopener", window);
     });
 
   ]]></script>
 </window>
rename from docshell/test/chrome/test_bug215405.xhtml
rename to docshell/test/chrome/test_bug215405.xul
--- a/docshell/test/chrome/test_bug215405.xhtml
+++ b/docshell/test/chrome/test_bug215405.xul
@@ -23,15 +23,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 215405 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug215405_window.xhtml", "bug215405",
+window.openDialog("bug215405_window.xul", "bug215405",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug293235.xhtml
rename to docshell/test/chrome/test_bug293235.xul
--- a/docshell/test/chrome/test_bug293235.xhtml
+++ b/docshell/test/chrome/test_bug293235.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 293235 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug293235_window.xhtml", "bug293235",
+window.openDialog("bug293235_window.xul", "bug293235",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug294258.xhtml
rename to docshell/test/chrome/test_bug294258.xul
--- a/docshell/test/chrome/test_bug294258.xhtml
+++ b/docshell/test/chrome/test_bug294258.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 294258 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug294258_window.xhtml", "bug294258",
+window.openDialog("bug294258_window.xul", "bug294258",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug298622.xhtml
rename to docshell/test/chrome/test_bug298622.xul
--- a/docshell/test/chrome/test_bug298622.xhtml
+++ b/docshell/test/chrome/test_bug298622.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 298622 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug298622_window.xhtml", "bug298622",
+window.openDialog("bug298622_window.xul", "bug298622",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug301397.xhtml
rename to docshell/test/chrome/test_bug301397.xul
--- a/docshell/test/chrome/test_bug301397.xhtml
+++ b/docshell/test/chrome/test_bug301397.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 301397 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug301397_window.xhtml", "bug301397",
+window.openDialog("bug301397_window.xul", "bug301397",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug303267.xhtml
rename to docshell/test/chrome/test_bug303267.xul
--- a/docshell/test/chrome/test_bug303267.xhtml
+++ b/docshell/test/chrome/test_bug303267.xul
@@ -25,15 +25,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 SimpleTest.expectAssertions(0, 1);
 
 /** Test for Bug 303267 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug303267_window.xhtml", "bug303267",
+window.openDialog("bug303267_window.xul", "bug303267",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug311007.xhtml
rename to docshell/test/chrome/test_bug311007.xul
--- a/docshell/test/chrome/test_bug311007.xhtml
+++ b/docshell/test/chrome/test_bug311007.xul
@@ -28,15 +28,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 if (navigator.platform.startsWith("Win")) {
   SimpleTest.expectAssertions(0, 1);
 }
 
 /** Test for Bug 311007 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug311007_window.xhtml", "bug311007",
+window.openDialog("bug311007_window.xul", "bug311007",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug321671.xhtml
rename to docshell/test/chrome/test_bug321671.xul
--- a/docshell/test/chrome/test_bug321671.xhtml
+++ b/docshell/test/chrome/test_bug321671.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 321671 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug321671_window.xhtml", "bug321671",
+window.openDialog("bug321671_window.xul", "bug321671",
                   "chrome,width=600,height=600,scrollbars,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug360511.xhtml
rename to docshell/test/chrome/test_bug360511.xul
--- a/docshell/test/chrome/test_bug360511.xhtml
+++ b/docshell/test/chrome/test_bug360511.xul
@@ -25,15 +25,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 360511 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug360511_window.xhtml", "bug360511",
+window.openDialog("bug360511_window.xul", "bug360511",
                   "chrome,scrollbars,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug364461.xhtml
rename to docshell/test/chrome/test_bug364461.xul
--- a/docshell/test/chrome/test_bug364461.xhtml
+++ b/docshell/test/chrome/test_bug364461.xul
@@ -29,15 +29,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 SimpleTest.waitForExplicitFinish();
 
 SpecialPowers.pushPrefEnv({
   "set":[["security.data_uri.block_toplevel_data_uri_navigations", false]]
 }, runTests);
 
 function runTests() {
-  window.openDialog("bug364461_window.xhtml", "bug364461",
+  window.openDialog("bug364461_window.xul", "bug364461",
                     "chrome,width=600,height=600,noopener", window);
 }
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug396519.xhtml
rename to docshell/test/chrome/test_bug396519.xul
--- a/docshell/test/chrome/test_bug396519.xhtml
+++ b/docshell/test/chrome/test_bug396519.xul
@@ -16,13 +16,13 @@ https://bugzilla.mozilla.org/show_bug.cg
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
 
     /** Test for Bug 396519 **/
 
     SimpleTest.waitForExplicitFinish();
-    window.openDialog("bug396519_window.xhtml", "bug396519",
+    window.openDialog("bug396519_window.xul", "bug396519",
                       "chrome,width=600,height=600,noopener", window);
 
   ]]></script>
 </window>
rename from docshell/test/chrome/test_bug396649.xhtml
rename to docshell/test/chrome/test_bug396649.xul
--- a/docshell/test/chrome/test_bug396649.xhtml
+++ b/docshell/test/chrome/test_bug396649.xul
@@ -27,15 +27,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 396649 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug396649_window.xhtml", "bug396649",
+window.openDialog("bug396649_window.xul", "bug396649",
                   "chrome,width=600,height=600,scrollbars,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug449778.xhtml
rename to docshell/test/chrome/test_bug449778.xul
--- a/docshell/test/chrome/test_bug449778.xhtml
+++ b/docshell/test/chrome/test_bug449778.xul
@@ -16,14 +16,14 @@ https://bugzilla.mozilla.org/show_bug.cg
      target="_blank">Mozilla Bug 396519</a>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
     SimpleTest.waitForExplicitFinish();
 
     addLoadEvent(function() {
-      window.openDialog("bug449778_window.xhtml", "bug449778",
+      window.openDialog("bug449778_window.xul", "bug449778",
                         "chrome,width=800,height=800,noopener", window);
     });
 
   ]]></script>
 </window>
rename from docshell/test/chrome/test_bug449780.xhtml
rename to docshell/test/chrome/test_bug449780.xul
--- a/docshell/test/chrome/test_bug449780.xhtml
+++ b/docshell/test/chrome/test_bug449780.xul
@@ -16,14 +16,14 @@ https://bugzilla.mozilla.org/show_bug.cg
      target="_blank">Mozilla Bug 396519</a>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
     SimpleTest.waitForExplicitFinish();
 
     addLoadEvent(function() {
-      window.openDialog("bug449780_window.xhtml", "bug449780",
+      window.openDialog("bug449780_window.xul", "bug449780",
                         "chrome,width=800,height=800,noopener", window);
     });
 
   ]]></script>
 </window>
rename from docshell/test/chrome/test_bug453650.xhtml
rename to docshell/test/chrome/test_bug453650.xul
rename from docshell/test/chrome/test_bug454235.xhtml
rename to docshell/test/chrome/test_bug454235.xul
--- a/docshell/test/chrome/test_bug454235.xhtml
+++ b/docshell/test/chrome/test_bug454235.xul
@@ -44,12 +44,12 @@ function doTest() {
 
   SimpleTest.finish();
 }
 
 
 
   ]]></script>
   <box flex="1" style="visibility: hidden; border:5px black solid">
-    <browser style="border:5px blue solid" id="hiddenBrowser" src="bug454235-subframe.xhtml"/>
-    <browser style="border:5px yellow solid" id="offScreenBrowser" src="bug454235-subframe.xhtml"/>
+    <browser style="border:5px blue solid" id="hiddenBrowser" src="bug454235-subframe.xul"/>
+    <browser style="border:5px yellow solid" id="offScreenBrowser" src="bug454235-subframe.xul"/>
   </box>
 </window>
rename from docshell/test/chrome/test_bug456980.xhtml
rename to docshell/test/chrome/test_bug456980.xul
--- a/docshell/test/chrome/test_bug456980.xhtml
+++ b/docshell/test/chrome/test_bug456980.xul
@@ -16,14 +16,14 @@ https://bugzilla.mozilla.org/show_bug.cg
      target="_blank">Mozilla Bug 396519</a>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
     SimpleTest.waitForExplicitFinish();
 
     addLoadEvent(function() {
-      window.openDialog("bug113934_window.xhtml?chrome", "bug456980",
+      window.openDialog("bug113934_window.xul?chrome", "bug456980",
                         "chrome,width=800,height=800,noopener", window);
     });
 
   ]]></script>
 </window>
rename from docshell/test/chrome/test_bug565388.xhtml
rename to docshell/test/chrome/test_bug565388.xul
rename from docshell/test/chrome/test_bug582176.xhtml
rename to docshell/test/chrome/test_bug582176.xul
--- a/docshell/test/chrome/test_bug582176.xhtml
+++ b/docshell/test/chrome/test_bug582176.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 582176 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug582176_window.xhtml", "bug582176",
+window.openDialog("bug582176_window.xul", "bug582176",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug608669.xhtml
rename to docshell/test/chrome/test_bug608669.xul
--- a/docshell/test/chrome/test_bug608669.xhtml
+++ b/docshell/test/chrome/test_bug608669.xul
@@ -50,24 +50,24 @@ function* doTest() {
   is(notificationCount, 0, "initial count");
 
   // create a new window
   var testWin = chromeWindow.open("", "bug 608669", "chrome,width=600,height=600");
   testWin.x = "y";
   is(notificationCount, 1, "after created window");
 
   // Try loading in the window
-  testWin.location = "bug608669.xhtml";
+  testWin.location = "bug608669.xul";
   chromeWindow.onmessage = nextTest;
   yield undefined;
   is(notificationCount, 1, "after first load");
   is(testWin.x, "y", "reused window");
 
   // Try loading again in the window
-  testWin.location = "bug608669.xhtml?x";
+  testWin.location = "bug608669.xul?x";
   chromeWindow.onmessage = nextTest;
   yield undefined;
   is(notificationCount, 2, "after second load");
   is("x" in testWin, false, "didn't reuse window");
 
   chromeWindow.onmessage = null;
 
   testWin.close();
rename from docshell/test/chrome/test_bug662200.xhtml
rename to docshell/test/chrome/test_bug662200.xul
--- a/docshell/test/chrome/test_bug662200.xhtml
+++ b/docshell/test/chrome/test_bug662200.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 662200 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug662200_window.xhtml", "bug662200",
+window.openDialog("bug662200_window.xul", "bug662200",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug690056.xhtml
rename to docshell/test/chrome/test_bug690056.xul
--- a/docshell/test/chrome/test_bug690056.xhtml
+++ b/docshell/test/chrome/test_bug690056.xul
@@ -14,13 +14,13 @@ https://bugzilla.mozilla.org/show_bug.cg
      target="_blank">Mozilla Bug 690056</a>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript">
   <![CDATA[
   /** Test for Bug 690056 **/
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug690056_window.xhtml", "bug690056",
+window.openDialog("bug690056_window.xul", "bug690056",
                   "chrome,width=600,height=600,noopener", window);
   ]]>
   </script>
 </window>
rename from docshell/test/chrome/test_bug789773.xhtml
rename to docshell/test/chrome/test_bug789773.xul
rename from docshell/test/chrome/test_bug846906.xhtml
rename to docshell/test/chrome/test_bug846906.xul
rename from docshell/test/chrome/test_bug89419.xhtml
rename to docshell/test/chrome/test_bug89419.xul
--- a/docshell/test/chrome/test_bug89419.xhtml
+++ b/docshell/test/chrome/test_bug89419.xul
@@ -24,15 +24,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 89419 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug89419_window.xhtml", "bug89419",
+window.openDialog("bug89419_window.xul", "bug89419",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_bug92598.xhtml
rename to docshell/test/chrome/test_bug92598.xul
--- a/docshell/test/chrome/test_bug92598.xhtml
+++ b/docshell/test/chrome/test_bug92598.xul
@@ -23,15 +23,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 92598 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug92598_window.xhtml", "bug92598",
+window.openDialog("bug92598_window.xul", "bug92598",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_docRedirect.xhtml
rename to docshell/test/chrome/test_docRedirect.xul
rename from docshell/test/chrome/test_mozFrameType.xhtml
rename to docshell/test/chrome/test_mozFrameType.xul
--- a/docshell/test/chrome/test_mozFrameType.xhtml
+++ b/docshell/test/chrome/test_mozFrameType.xul
@@ -27,16 +27,16 @@ https://bugzilla.mozilla.org/show_bug.cg
 if (navigator.platform.startsWith("Win")) {
   SimpleTest.expectAssertions(0, 1);
 }
 
 /** Test for Bug 769771 **/
 SimpleTest.waitForExplicitFinish();
 
 addLoadEvent(function () {
-  window.openDialog("mozFrameType_window.xhtml", "mozFrameType",
+  window.openDialog("mozFrameType_window.xul", "mozFrameType",
                     "chrome,width=600,height=600,noopener", window);
 });
 
 ]]>
 </script>
 
 </window>
rename from docshell/test/chrome/test_principalInherit.xhtml
rename to docshell/test/chrome/test_principalInherit.xul
rename from docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml
rename to docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
--- a/docshell/test/chrome/window.template.txt
+++ b/docshell/test/chrome/window.template.txt
@@ -25,17 +25,17 @@
     }
 
     ////
     // Generator function for test steps for bug {BUGNUMBER}:  
     // Description goes here.
     //
     function testIterator()
     {
-      // Test steps go here.  See bug303267_window.xhtml for an example.
+      // Test steps go here.  See bug303267_window.xul for an example.
 
       // Tell the framework the test is finished.  Include the final 'yield' 
       // statement to prevent a StopIteration exception from being thrown.
       finish();
       yield undefined;
     }
     
   ]]></script>