Backed out changeset 40546d0aab39 (bug 1596328) for causing an ESlint failure CLOSED TREE

--HG--
rename : docshell/test/chrome/bug112564_window.xhtml => docshell/test/chrome/bug112564_window.xul
rename : docshell/test/chrome/bug113934_window.xhtml => docshell/test/chrome/bug113934_window.xul
rename : docshell/test/chrome/bug215405_window.xhtml => docshell/test/chrome/bug215405_window.xul
rename : docshell/test/chrome/bug293235_window.xhtml => docshell/test/chrome/bug293235_window.xul
rename : docshell/test/chrome/bug294258_window.xhtml => docshell/test/chrome/bug294258_window.xul
rename : docshell/test/chrome/bug298622_window.xhtml => docshell/test/chrome/bug298622_window.xul
rename : docshell/test/chrome/bug301397_window.xhtml => docshell/test/chrome/bug301397_window.xul
rename : docshell/test/chrome/bug303267_window.xhtml => docshell/test/chrome/bug303267_window.xul
rename : docshell/test/chrome/bug311007_window.xhtml => docshell/test/chrome/bug311007_window.xul
rename : docshell/test/chrome/bug321671_window.xhtml => docshell/test/chrome/bug321671_window.xul
rename : docshell/test/chrome/bug360511_window.xhtml => docshell/test/chrome/bug360511_window.xul
rename : docshell/test/chrome/bug364461_window.xhtml => docshell/test/chrome/bug364461_window.xul
rename : docshell/test/chrome/bug396519_window.xhtml => docshell/test/chrome/bug396519_window.xul
rename : docshell/test/chrome/bug396649_window.xhtml => docshell/test/chrome/bug396649_window.xul
rename : docshell/test/chrome/bug449778_window.xhtml => docshell/test/chrome/bug449778_window.xul
rename : docshell/test/chrome/bug449780_window.xhtml => docshell/test/chrome/bug449780_window.xul
rename : docshell/test/chrome/bug454235-subframe.xhtml => docshell/test/chrome/bug454235-subframe.xul
rename : docshell/test/chrome/bug582176_window.xhtml => docshell/test/chrome/bug582176_window.xul
rename : docshell/test/chrome/bug608669.xhtml => docshell/test/chrome/bug608669.xul
rename : docshell/test/chrome/bug662200_window.xhtml => docshell/test/chrome/bug662200_window.xul
rename : docshell/test/chrome/bug690056_window.xhtml => docshell/test/chrome/bug690056_window.xul
rename : docshell/test/chrome/bug89419_window.xhtml => docshell/test/chrome/bug89419_window.xul
rename : docshell/test/chrome/bug92598_window.xhtml => docshell/test/chrome/bug92598_window.xul
rename : docshell/test/chrome/mozFrameType_window.xhtml => docshell/test/chrome/mozFrameType_window.xul
rename : docshell/test/chrome/test_bug112564.xhtml => docshell/test/chrome/test_bug112564.xul
rename : docshell/test/chrome/test_bug113934.xhtml => docshell/test/chrome/test_bug113934.xul
rename : docshell/test/chrome/test_bug215405.xhtml => docshell/test/chrome/test_bug215405.xul
rename : docshell/test/chrome/test_bug293235.xhtml => docshell/test/chrome/test_bug293235.xul
rename : docshell/test/chrome/test_bug294258.xhtml => docshell/test/chrome/test_bug294258.xul
rename : docshell/test/chrome/test_bug298622.xhtml => docshell/test/chrome/test_bug298622.xul
rename : docshell/test/chrome/test_bug301397.xhtml => docshell/test/chrome/test_bug301397.xul
rename : docshell/test/chrome/test_bug303267.xhtml => docshell/test/chrome/test_bug303267.xul
rename : docshell/test/chrome/test_bug311007.xhtml => docshell/test/chrome/test_bug311007.xul
rename : docshell/test/chrome/test_bug321671.xhtml => docshell/test/chrome/test_bug321671.xul
rename : docshell/test/chrome/test_bug360511.xhtml => docshell/test/chrome/test_bug360511.xul
rename : docshell/test/chrome/test_bug364461.xhtml => docshell/test/chrome/test_bug364461.xul
rename : docshell/test/chrome/test_bug396519.xhtml => docshell/test/chrome/test_bug396519.xul
rename : docshell/test/chrome/test_bug396649.xhtml => docshell/test/chrome/test_bug396649.xul
rename : docshell/test/chrome/test_bug449778.xhtml => docshell/test/chrome/test_bug449778.xul
rename : docshell/test/chrome/test_bug449780.xhtml => docshell/test/chrome/test_bug449780.xul
rename : docshell/test/chrome/test_bug453650.xhtml => docshell/test/chrome/test_bug453650.xul
rename : docshell/test/chrome/test_bug454235.xhtml => docshell/test/chrome/test_bug454235.xul
rename : docshell/test/chrome/test_bug456980.xhtml => docshell/test/chrome/test_bug456980.xul
rename : docshell/test/chrome/test_bug565388.xhtml => docshell/test/chrome/test_bug565388.xul
rename : docshell/test/chrome/test_bug582176.xhtml => docshell/test/chrome/test_bug582176.xul
rename : docshell/test/chrome/test_bug608669.xhtml => docshell/test/chrome/test_bug608669.xul
rename : docshell/test/chrome/test_bug662200.xhtml => docshell/test/chrome/test_bug662200.xul
rename : docshell/test/chrome/test_bug690056.xhtml => docshell/test/chrome/test_bug690056.xul
rename : docshell/test/chrome/test_bug789773.xhtml => docshell/test/chrome/test_bug789773.xul
rename : docshell/test/chrome/test_bug846906.xhtml => docshell/test/chrome/test_bug846906.xul
rename : docshell/test/chrome/test_bug89419.xhtml => docshell/test/chrome/test_bug89419.xul
rename : docshell/test/chrome/test_bug92598.xhtml => docshell/test/chrome/test_bug92598.xul
rename : docshell/test/chrome/test_docRedirect.xhtml => docshell/test/chrome/test_docRedirect.xul
rename : docshell/test/chrome/test_mozFrameType.xhtml => docshell/test/chrome/test_mozFrameType.xul
rename : docshell/test/chrome/test_principalInherit.xhtml => docshell/test/chrome/test_principalInherit.xul
rename : docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml => docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul

docshell/test/chrome/chrome.ini

@@ -6,85 +6,85 @@ support-files =
   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]

docshell/test/chrome/gen_template.pl

@@ -8,7 +8,7 @@
 #
 #   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;
@@ -18,7 +18,7 @@ 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;
@@ -29,7 +29,7 @@ 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;

docshell/test/chrome/test_bug112564.xul

@@ -28,7 +28,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=112564
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug113934.xul

@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=113934
     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);
     });
 

docshell/test/chrome/test_bug215405.xul

@@ -28,7 +28,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=215405
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug293235.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=293235.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug294258.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=294258.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug298622.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=298622.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug301397.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=301397.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug303267.xul

@@ -30,7 +30,7 @@ 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);
 
 ]]>

docshell/test/chrome/test_bug311007.xul

@@ -33,7 +33,7 @@ if (navigator.platform.startsWith("Win")) {
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug321671.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=321671.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug360511.xul

@@ -30,7 +30,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=360511.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug364461.xul

@@ -34,7 +34,7 @@ SpecialPowers.pushPrefEnv({
 }, runTests);
 
 function runTests() {
-  window.openDialog("bug364461_window.xhtml", "bug364461",
+  window.openDialog("bug364461_window.xul", "bug364461",
                     "chrome,width=600,height=600,noopener", window);
 }
 ]]>

docshell/test/chrome/test_bug396519.xul

@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396519
     /** 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>

docshell/test/chrome/test_bug396649.xul

@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396649.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug449778.xul

@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=449778
     SimpleTest.waitForExplicitFinish();
 
     addLoadEvent(function() {
-      window.openDialog("bug449778_window.xhtml", "bug449778",
+      window.openDialog("bug449778_window.xul", "bug449778",
                         "chrome,width=800,height=800,noopener", window);
     });
 

docshell/test/chrome/test_bug449780.xul

@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=449780
     SimpleTest.waitForExplicitFinish();
 
     addLoadEvent(function() {
-      window.openDialog("bug449780_window.xhtml", "bug449780",
+      window.openDialog("bug449780_window.xul", "bug449780",
                         "chrome,width=800,height=800,noopener", window);
     });
 

docshell/test/chrome/test_bug454235.xul

@@ -49,7 +49,7 @@ function doTest() {
 
   ]]></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>

docshell/test/chrome/test_bug456980.xul

@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=456980
     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);
     });
 

docshell/test/chrome/test_bug582176.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=582176.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug608669.xul

@@ -55,14 +55,14 @@ function* doTest() {
   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");

docshell/test/chrome/test_bug662200.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=662200.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug690056.xul

@@ -19,7 +19,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=690056
   <![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>

docshell/test/chrome/test_bug89419.xul

@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=89419.xul
 /** 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);
 
 ]]>

docshell/test/chrome/test_bug92598.xul

@@ -28,7 +28,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=92598
 /** 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);
 
 ]]>

docshell/test/chrome/test_mozFrameType.xul

@@ -32,7 +32,7 @@ if (navigator.platform.startsWith("Win")) {
 SimpleTest.waitForExplicitFinish();
 
 addLoadEvent(function () {
-  window.openDialog("mozFrameType_window.xhtml", "mozFrameType",
+  window.openDialog("mozFrameType_window.xul", "mozFrameType",
                     "chrome,width=600,height=600,noopener", window);
 });
 

docshell/test/chrome/window.template.txt

@@ -30,7 +30,7 @@
     //
     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.