Bug 1595877, replace .xul mochitest files in layout/ with .xhtml r=dholbert
authorEmma Malysz <emalysz@mozilla.com>
Thu, 14 Nov 2019 20:25:21 +0000
changeset 502047 0a08184c5efec65571ba403e03bc9b983a436caf
parent 502046 f6825602e27a50f03c9c01aebdc8b6bb81bea6f0
child 502048 2d2a7cb4d6ffcfd51552d08b1aff7fb1b04e3430
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)
reviewersdholbert
bugs1595877
milestone72.0a1
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
Bug 1595877, replace .xul mochitest files in layout/ with .xhtml r=dholbert Differential Revision: https://phabricator.services.mozilla.com/D52728
.eslintrc.js
layout/base/tests/chrome/chrome.ini
layout/base/tests/chrome/chrome_content_integration_window.xhtml
layout/base/tests/chrome/chrome_content_integration_window.xul
layout/base/tests/chrome/chrome_over_plugin_window.xhtml
layout/base/tests/chrome/chrome_over_plugin_window.xul
layout/base/tests/chrome/default_background_window.xhtml
layout/base/tests/chrome/default_background_window.xul
layout/base/tests/chrome/dialog_with_positioning_window.xhtml
layout/base/tests/chrome/dialog_with_positioning_window.xul
layout/base/tests/chrome/file_bug1018265.xhtml
layout/base/tests/chrome/file_bug1018265.xul
layout/base/tests/chrome/printpreview_bug396024_helper.xhtml
layout/base/tests/chrome/printpreview_bug396024_helper.xul
layout/base/tests/chrome/printpreview_bug482976_helper.xhtml
layout/base/tests/chrome/printpreview_bug482976_helper.xul
layout/base/tests/chrome/printpreview_helper.xhtml
layout/base/tests/chrome/printpreview_helper.xul
layout/base/tests/chrome/test_bug1018265.xhtml
layout/base/tests/chrome/test_bug1018265.xul
layout/base/tests/chrome/test_bug1041200.xhtml
layout/base/tests/chrome/test_bug1041200.xul
layout/base/tests/chrome/test_bug420499.xhtml
layout/base/tests/chrome/test_bug420499.xul
layout/base/tests/chrome/test_bug465448.xhtml
layout/base/tests/chrome/test_bug465448.xul
layout/base/tests/chrome/test_bug514660.xhtml
layout/base/tests/chrome/test_bug514660.xul
layout/base/tests/chrome/test_bug533845.xhtml
layout/base/tests/chrome/test_bug533845.xul
layout/base/tests/chrome/test_bug812817.xhtml
layout/base/tests/chrome/test_bug812817.xul
layout/base/tests/chrome/test_chrome_content_integration.xhtml
layout/base/tests/chrome/test_chrome_content_integration.xul
layout/base/tests/chrome/test_chrome_over_plugin.xhtml
layout/base/tests/chrome/test_chrome_over_plugin.xul
layout/base/tests/chrome/test_css_visibility_propagation.xhtml
layout/base/tests/chrome/test_css_visibility_propagation.xul
layout/base/tests/chrome/test_default_background.xhtml
layout/base/tests/chrome/test_default_background.xul
layout/base/tests/chrome/test_dialog_with_positioning.html
layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xhtml
layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
layout/base/tests/chrome/test_printpreview.xhtml
layout/base/tests/chrome/test_printpreview.xul
layout/base/tests/chrome/test_printpreview_bug396024.xhtml
layout/base/tests/chrome/test_printpreview_bug396024.xul
layout/base/tests/chrome/test_printpreview_bug482976.xhtml
layout/base/tests/chrome/test_printpreview_bug482976.xul
layout/forms/test/bug665540_window.xhtml
layout/forms/test/bug665540_window.xul
layout/forms/test/chrome.ini
layout/forms/test/test_bug665540.html
layout/generic/test/chrome.ini
layout/generic/test/file_bug514732_window.xhtml
layout/generic/test/file_bug514732_window.xul
layout/generic/test/test_backspace_delete.xhtml
layout/generic/test/test_backspace_delete.xul
layout/generic/test/test_bug469613.xhtml
layout/generic/test/test_bug469613.xul
layout/generic/test/test_bug469774.xhtml
layout/generic/test/test_bug469774.xul
layout/generic/test/test_bug508115.xhtml
layout/generic/test/test_bug508115.xul
layout/generic/test/test_bug514732-2.xhtml
layout/generic/test/test_bug514732-2.xul
layout/generic/test/test_bug632379.xhtml
layout/generic/test/test_bug632379.xul
layout/inspector/tests/chrome/chrome.ini
layout/inspector/tests/chrome/test_bug467669.xhtml
layout/inspector/tests/chrome/test_bug467669.xul
layout/inspector/tests/chrome/test_bug695639.xhtml
layout/inspector/tests/chrome/test_bug695639.xul
layout/inspector/tests/chrome/test_bug708874.xhtml
layout/inspector/tests/chrome/test_bug708874.xul
layout/inspector/tests/chrome/test_bug727834.xhtml
layout/inspector/tests/chrome/test_bug727834.xul
layout/inspector/tests/chrome/test_fontFaceGeneric.xhtml
layout/inspector/tests/chrome/test_fontFaceGeneric.xul
layout/inspector/tests/chrome/test_fontFaceRanges.xhtml
layout/inspector/tests/chrome/test_fontFaceRanges.xul
layout/inspector/tests/chrome/test_fontFeaturesAPI.xhtml
layout/inspector/tests/chrome/test_fontFeaturesAPI.xul
layout/inspector/tests/chrome/test_fontVariationsAPI.xhtml
layout/inspector/tests/chrome/test_fontVariationsAPI.xul
layout/style/test/chrome/bug535806-xul.xhtml
layout/style/test/chrome/bug535806-xul.xul
layout/style/test/chrome/chrome.ini
layout/style/test/chrome/test_bug1160724.xhtml
layout/style/test/chrome/test_bug1160724.xul
layout/style/test/chrome/test_bug418986-2.xhtml
layout/style/test/chrome/test_bug418986-2.xul
layout/style/test/chrome/test_bug535806.xhtml
layout/style/test/chrome/test_bug535806.xul
layout/xul/test/chrome.ini
layout/xul/test/test_bug1197913.xhtml
layout/xul/test/test_bug1197913.xul
layout/xul/test/test_bug159346.xhtml
layout/xul/test/test_bug159346.xul
layout/xul/test/test_bug372685.xhtml
layout/xul/test/test_bug372685.xul
layout/xul/test/test_bug393970.xhtml
layout/xul/test/test_bug393970.xul
layout/xul/test/test_bug398982-1.xhtml
layout/xul/test/test_bug398982-1.xul
layout/xul/test/test_bug398982-2.xhtml
layout/xul/test/test_bug398982-2.xul
layout/xul/test/test_bug467442.xhtml
layout/xul/test/test_bug467442.xul
layout/xul/test/test_bug477754.xhtml
layout/xul/test/test_bug477754.xul
layout/xul/test/test_bug703150.xhtml
layout/xul/test/test_bug703150.xul
layout/xul/test/test_bug987230.xhtml
layout/xul/test/test_bug987230.xul
layout/xul/test/test_popupReflowPos.xhtml
layout/xul/test/test_popupReflowPos.xul
layout/xul/test/test_popupSizeTo.xhtml
layout/xul/test/test_popupSizeTo.xul
layout/xul/test/test_popupZoom.xhtml
layout/xul/test/test_popupZoom.xul
layout/xul/test/test_resizer.xhtml
layout/xul/test/test_resizer.xul
layout/xul/test/test_resizer_incontent.xhtml
layout/xul/test/test_resizer_incontent.xul
layout/xul/test/test_splitter.xhtml
layout/xul/test/test_splitter.xul
layout/xul/test/test_submenuClose.xhtml
layout/xul/test/test_submenuClose.xul
layout/xul/test/test_windowminmaxsize.xhtml
layout/xul/test/test_windowminmaxsize.xul
layout/xul/test/titledpanelwindow.xhtml
layout/xul/test/titledpanelwindow.xul
layout/xul/test/window_resizer.xhtml
layout/xul/test/window_resizer.xul
layout/xul/test/window_resizer_element.xhtml
layout/xul/test/window_resizer_element.xul
layout/xul/test/windowminmaxsize1.xhtml
layout/xul/test/windowminmaxsize1.xul
layout/xul/test/windowminmaxsize10.xhtml
layout/xul/test/windowminmaxsize10.xul
layout/xul/test/windowminmaxsize2.xhtml
layout/xul/test/windowminmaxsize2.xul
layout/xul/test/windowminmaxsize3.xhtml
layout/xul/test/windowminmaxsize3.xul
layout/xul/test/windowminmaxsize4.xhtml
layout/xul/test/windowminmaxsize4.xul
layout/xul/test/windowminmaxsize5.xhtml
layout/xul/test/windowminmaxsize5.xul
layout/xul/test/windowminmaxsize6.xhtml
layout/xul/test/windowminmaxsize6.xul
layout/xul/test/windowminmaxsize7.xhtml
layout/xul/test/windowminmaxsize7.xul
layout/xul/test/windowminmaxsize8.xhtml
layout/xul/test/windowminmaxsize8.xul
layout/xul/test/windowminmaxsize9.xhtml
layout/xul/test/windowminmaxsize9.xul
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -159,16 +159,18 @@ module.exports = {
     ],
     "rules": {
       "object-shorthand": "off",
       "mozilla/avoid-removeChild": "off",
       "mozilla/consistent-if-bracing": "off",
       "mozilla/reject-importGlobalProperties": "off",
       "mozilla/no-arbitrary-setTimeout": "off",
       "mozilla/no-define-cc-etc": "off",
+      "mozilla/no-useless-parameters": "off",
+      "mozilla/no-useless-removeEventListener": "off",
       "mozilla/use-chromeutils-generateqi": "off",
       "mozilla/use-default-preference-values": "off",
       "mozilla/use-includes-instead-of-indexOf": "off",
       "mozilla/use-services": "off",
       "mozilla/use-ownerGlobal": "off",
       "complexity": "off",
       "consistent-return": "off",
       "no-array-constructor": "off",
@@ -181,16 +183,17 @@ module.exports = {
       "no-implied-eval": "off",
       "no-lonely-if": "off",
       "no-nested-ternary": "off",
       "no-new-wrappers": "off",
       "no-redeclare": "off",
       "no-restricted-globals": "off",
       "no-return-await": "off",
       "no-sequences": "off",
+      "no-shadow": "off",
       "no-throw-literal": "off",
       "no-useless-concat": "off",
       "no-undef": "off",
       "no-unreachable": "off",
       "no-unsanitized/method": "off",
       "no-unsanitized/property": "off",
       "no-unsafe-negation": "off",
       "no-unused-vars": "off",
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -2,72 +2,72 @@
 prefs =
   layout.css.individual-transform.enabled=true
   plugin.load_flash_only=false
 skip-if = os == 'android'
 support-files =
   animated.gif
   blue-32x32.png
   bug551434_childframe.html
-  chrome_content_integration_window.xul
-  default_background_window.xul
-  dialog_with_positioning_window.xul
+  chrome_content_integration_window.xhtml
+  default_background_window.xhtml
+  dialog_with_positioning_window.xhtml
   file_bug458898.html
-  printpreview_bug396024_helper.xul
-  printpreview_bug482976_helper.xul
-  printpreview_helper.xul
+  printpreview_bug396024_helper.xhtml
+  printpreview_bug482976_helper.xhtml
+  printpreview_helper.xhtml
   printpreview_font_api.html
   printpreview_font_api_ref.html
   printpreview_font_mozprintcallback.html
   printpreview_font_mozprintcallback_ref.html
   printpreview_quirks.html
   printpreview_quirks_ref.html
-  file_bug1018265.xul
+  file_bug1018265.xhtml
 
 [test_bug396367-1.html]
 [test_bug396367-2.html]
-[test_bug420499.xul]
+[test_bug420499.xhtml]
 [test_bug458898.html]
-[test_bug465448.xul]
+[test_bug465448.xhtml]
 support-files =
   file_bug465448.html
-[test_bug514660.xul]
-[test_bug533845.xul]
+[test_bug514660.xhtml]
+[test_bug533845.xhtml]
 skip-if = os == 'linux' && !debug # Bug 1208197
 [test_bug551434.html]
 [test_bug708062.html]
-[test_bug812817.xul]
+[test_bug812817.xhtml]
 [test_bug847890_paintFlashing.html]
-[test_bug1018265.xul]
-[test_bug1041200.xul]
+[test_bug1018265.xhtml]
+[test_bug1041200.xhtml]
 skip-if = os == 'win' && bits == 64 # Bug 1272321
 support-files =
   bug1041200_frame.html
   bug1041200_window.html
-[test_chrome_content_integration.xul]
-[test_chrome_over_plugin.xul]
+[test_chrome_content_integration.xhtml]
+[test_chrome_over_plugin.xhtml]
 support-files =
-  chrome_over_plugin_window.xul
+  chrome_over_plugin_window.xhtml
   chrome_over_plugin_window_frame.html
-[test_default_background.xul]
+[test_default_background.xhtml]
 [test_dialog_with_positioning.html]
 tags = openwindow
 [test_fixed_bg_scrolling_repaints.html]
-[test_leaf_layers_partition_browser_window.xul]
+[test_leaf_layers_partition_browser_window.xhtml]
 skip-if = true # Bug 992311
 [test_prerendered_transforms.html]
-[test_printpreview.xul]
+[test_printpreview.xhtml]
 skip-if = (os == "linux" && bits == 32) || (verify && (os == 'win')) # Disabled on Linux32 for bug 1278957
-[test_printpreview_bug396024.xul]
+[test_printpreview_bug396024.xhtml]
 skip-if = (verify && (os == 'win'))
-[test_printpreview_bug482976.xul]
+[test_printpreview_bug482976.xhtml]
 skip-if = (verify && (os == 'win'))
 [test_scrolling_repaints.html]
 [test_will_change.html]
 skip-if = webrender
 [test_getClientRectsAndTexts.html]
-[test_css_visibility_propagation.xul]
+[test_css_visibility_propagation.xhtml]
 support-files =
   window_css_visibility_propagation-1.html
   window_css_visibility_propagation-2.html
   window_css_visibility_propagation-3.html
   window_css_visibility_propagation-4.html
   frame_css_visibility_propagation.html
rename from layout/base/tests/chrome/chrome_content_integration_window.xul
rename to layout/base/tests/chrome/chrome_content_integration_window.xhtml
rename from layout/base/tests/chrome/chrome_over_plugin_window.xul
rename to layout/base/tests/chrome/chrome_over_plugin_window.xhtml
rename from layout/base/tests/chrome/default_background_window.xul
rename to layout/base/tests/chrome/default_background_window.xhtml
rename from layout/base/tests/chrome/dialog_with_positioning_window.xul
rename to layout/base/tests/chrome/dialog_with_positioning_window.xhtml
rename from layout/base/tests/chrome/file_bug1018265.xul
rename to layout/base/tests/chrome/file_bug1018265.xhtml
rename from layout/base/tests/chrome/printpreview_bug396024_helper.xul
rename to layout/base/tests/chrome/printpreview_bug396024_helper.xhtml
rename from layout/base/tests/chrome/printpreview_bug482976_helper.xul
rename to layout/base/tests/chrome/printpreview_bug482976_helper.xhtml
rename from layout/base/tests/chrome/printpreview_helper.xul
rename to layout/base/tests/chrome/printpreview_helper.xhtml
rename from layout/base/tests/chrome/test_bug1018265.xul
rename to layout/base/tests/chrome/test_bug1018265.xhtml
--- a/layout/base/tests/chrome/test_bug1018265.xul
+++ b/layout/base/tests/chrome/test_bug1018265.xhtml
@@ -14,17 +14,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript">
   <![CDATA[
 
   /** Test for Bug 1018265 **/
 
   SimpleTest.waitForExplicitFinish();
 
   function run() {
-    window.openDialog("file_bug1018265.xul", "contentViewerTest", "chrome,width=100,height=100,noopener", window);
+    window.openDialog("file_bug1018265.xhtml", "contentViewerTest", "chrome,width=100,height=100,noopener", window);
   }
 
   function done() {
     ok(true, "done");
     setTimeout(function() { SimpleTest.finish(); }, 0);
   }
   ]]>
   </script>
rename from layout/base/tests/chrome/test_bug1041200.xul
rename to layout/base/tests/chrome/test_bug1041200.xhtml
rename from layout/base/tests/chrome/test_bug420499.xul
rename to layout/base/tests/chrome/test_bug420499.xhtml
rename from layout/base/tests/chrome/test_bug465448.xul
rename to layout/base/tests/chrome/test_bug465448.xhtml
rename from layout/base/tests/chrome/test_bug514660.xul
rename to layout/base/tests/chrome/test_bug514660.xhtml
rename from layout/base/tests/chrome/test_bug533845.xul
rename to layout/base/tests/chrome/test_bug533845.xhtml
rename from layout/base/tests/chrome/test_bug812817.xul
rename to layout/base/tests/chrome/test_bug812817.xhtml
rename from layout/base/tests/chrome/test_chrome_content_integration.xul
rename to layout/base/tests/chrome/test_chrome_content_integration.xhtml
--- a/layout/base/tests/chrome/test_chrome_content_integration.xul
+++ b/layout/base/tests/chrome/test_chrome_content_integration.xhtml
@@ -12,13 +12,13 @@
 
   <!-- test code goes here -->
   <script type="application/javascript">
   <![CDATA[
     SimpleTest.waitForExplicitFinish();
     // Run the test in a separate window so that the test runs as a chrome
     // window
     var root = getRootDirectory(window.location.href);
-    window.openDialog(root + "chrome_content_integration_window.xul", "chrome_content_integration",
+    window.openDialog(root + "chrome_content_integration_window.xhtml", "chrome_content_integration",
                       "chrome,width=200,height=300,noopener", window);
   ]]>
   </script>
 </window>
rename from layout/base/tests/chrome/test_chrome_over_plugin.xul
rename to layout/base/tests/chrome/test_chrome_over_plugin.xhtml
--- a/layout/base/tests/chrome/test_chrome_over_plugin.xul
+++ b/layout/base/tests/chrome/test_chrome_over_plugin.xhtml
@@ -12,13 +12,13 @@
 
   <!-- test code goes here -->
   <script type="application/javascript">
   <![CDATA[
     SimpleTest.waitForExplicitFinish();
     // Run the test in a separate window so that the test runs as a chrome
     // window
     SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    var w = window.openDialog("chrome_over_plugin_window.xul", "chrome_over_plugin",
+    var w = window.openDialog("chrome_over_plugin_window.xhtml", "chrome_over_plugin",
                               "chrome,width=200,height=300,noopener", window);
   ]]>
   </script>
 </window>
rename from layout/base/tests/chrome/test_css_visibility_propagation.xul
rename to layout/base/tests/chrome/test_css_visibility_propagation.xhtml
rename from layout/base/tests/chrome/test_default_background.xul
rename to layout/base/tests/chrome/test_default_background.xhtml
--- a/layout/base/tests/chrome/test_default_background.xul
+++ b/layout/base/tests/chrome/test_default_background.xhtml
@@ -10,13 +10,13 @@
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript">
   <![CDATA[
     SimpleTest.waitForExplicitFinish();
     // Run the test in a separate window so that the test runs as a chrome
     // window
-    window.openDialog("default_background_window.xul", "default_background",
+    window.openDialog("default_background_window.xhtml", "default_background",
                       "chrome,width=200,height=300,noopener", window);
   ]]>
   </script>
 </window>
--- a/layout/base/tests/chrome/test_dialog_with_positioning.html
+++ b/layout/base/tests/chrome/test_dialog_with_positioning.html
@@ -7,14 +7,14 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <pre id="test">
 <script type="application/javascript">
 SimpleTest.waitForExplicitFinish();
 
 var root = getRootDirectory(window.location.href);
-window.openDialog(root + "dialog_with_positioning_window.xul", "dialog_with_positioning",
+window.openDialog(root + "dialog_with_positioning_window.xhtml", "dialog_with_positioning",
                   "dialog,chrome,noopener", window);
 </script>
 </pre>
 </body>
 </html>
rename from layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
rename to layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xhtml
rename from layout/base/tests/chrome/test_printpreview.xul
rename to layout/base/tests/chrome/test_printpreview.xhtml
--- a/layout/base/tests/chrome/test_printpreview.xul
+++ b/layout/base/tests/chrome/test_printpreview.xhtml
@@ -5,11 +5,11 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 <body xmlns="http://www.w3.org/1999/xhtml">
 </body>
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
-window.openDialog("printpreview_helper.xul", "printpreview", "chrome,width=100,height=100,noopener", window);
+window.openDialog("printpreview_helper.xhtml", "printpreview", "chrome,width=100,height=100,noopener", window);
 ]]></script>
 </window>
rename from layout/base/tests/chrome/test_printpreview_bug396024.xul
rename to layout/base/tests/chrome/test_printpreview_bug396024.xhtml
--- a/layout/base/tests/chrome/test_printpreview_bug396024.xul
+++ b/layout/base/tests/chrome/test_printpreview_bug396024.xhtml
@@ -11,11 +11,11 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body xmlns="http://www.w3.org/1999/xhtml">
 <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=396024"
    target="_blank">Mozilla Bug 396024</a>
 </body>
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
-window.openDialog("printpreview_bug396024_helper.xul", "bug396024", "chrome,width=100,height=100,noopener", window);
+window.openDialog("printpreview_bug396024_helper.xhtml", "bug396024", "chrome,width=100,height=100,noopener", window);
 ]]></script>
 </window>
rename from layout/base/tests/chrome/test_printpreview_bug482976.xul
rename to layout/base/tests/chrome/test_printpreview_bug482976.xhtml
--- a/layout/base/tests/chrome/test_printpreview_bug482976.xul
+++ b/layout/base/tests/chrome/test_printpreview_bug482976.xhtml
@@ -11,11 +11,11 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body xmlns="http://www.w3.org/1999/xhtml">
 <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=482976"
    target="_blank">Mozilla Bug 482976</a>
 </body>
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
-window.openDialog("printpreview_bug482976_helper.xul", "bug482976", "chrome,width=100,height=100,noopener", window);
+window.openDialog("printpreview_bug482976_helper.xhtml", "bug482976", "chrome,width=100,height=100,noopener", window);
 ]]></script>
 </window>
rename from layout/forms/test/bug665540_window.xul
rename to layout/forms/test/bug665540_window.xhtml
--- a/layout/forms/test/chrome.ini
+++ b/layout/forms/test/chrome.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 skip-if = os == 'android'
 support-files =
   bug536567_iframe.html
   bug536567_subframe.html
-  bug665540_window.xul
+  bug665540_window.xhtml
 
 [test_bug536567_perwindowpb.html]
 [test_bug665540.html]
 tags = fullscreen
 skip-if = (os == 'linux' && bits == 64) # Bug 888164
--- a/layout/forms/test/test_bug665540.html
+++ b/layout/forms/test/test_bug665540.html
@@ -27,17 +27,17 @@ var select;
 var optiona;
 var eventType = "mouseover";
 var timeoutID;
 var eventOffsetX = 2;
 var eventOffsetY = 2;
 
 function openFullscreenWindow() {
     win = window.docShell.rootTreeItem.domWindow
-                .openDialog("bug665540_window.xul", "_blank", "resizable=yes,chrome", window);
+                .openDialog("bug665540_window.xhtml", "_blank", "resizable=yes,chrome", window);
     win.addEventListener("sizemodechange",
                          function() {
                            info("sizemodechange. windowState = " + win.windowState + " fullScreen = " + win.fullScreen);
                          });
     win.addEventListener("fullscreen",
                          function() {
                            info("fullscreen event. windowState = " + win.windowState + " fullScreen = " + win.fullScreen);
                          });
--- a/layout/generic/test/chrome.ini
+++ b/layout/generic/test/chrome.ini
@@ -1,17 +1,17 @@
 [DEFAULT]
 skip-if = os == 'android'
 support-files =
-  file_bug514732_window.xul
+  file_bug514732_window.xhtml
   frame_selection_underline-ref.xhtml
   frame_selection_underline.css
   frame_selection_underline.xhtml
 
-[test_backspace_delete.xul]
+[test_backspace_delete.xhtml]
 skip-if = true # Bug 1163311
-[test_bug469613.xul]
-[test_bug469774.xul]
-[test_bug508115.xul]
-[test_bug514732-2.xul]
-[test_bug632379.xul]
+[test_bug469613.xhtml]
+[test_bug469774.xhtml]
+[test_bug508115.xhtml]
+[test_bug514732-2.xhtml]
+[test_bug632379.xhtml]
 skip-if = os == 'linux' || (verify && (os == 'win')) # Bug 1207914
 [test_selection_underline.html]
rename from layout/generic/test/file_bug514732_window.xul
rename to layout/generic/test/file_bug514732_window.xhtml
rename from layout/generic/test/test_backspace_delete.xul
rename to layout/generic/test/test_backspace_delete.xhtml
rename from layout/generic/test/test_bug469613.xul
rename to layout/generic/test/test_bug469613.xhtml
rename from layout/generic/test/test_bug469774.xul
rename to layout/generic/test/test_bug469774.xhtml
rename from layout/generic/test/test_bug508115.xul
rename to layout/generic/test/test_bug508115.xhtml
rename from layout/generic/test/test_bug514732-2.xul
rename to layout/generic/test/test_bug514732-2.xhtml
--- a/layout/generic/test/test_bug514732-2.xul
+++ b/layout/generic/test/test_bug514732-2.xhtml
@@ -26,15 +26,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 </body>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
 /** Test for Bug 514732 **/
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("file_bug514732_window.xul", "bug514732",
+window.openDialog("file_bug514732_window.xhtml", "bug514732",
                   "chrome,width=600,height=600,scrollbars,noopener", window);
 
 ]]>
 </script>
 
 </window>
rename from layout/generic/test/test_bug632379.xul
rename to layout/generic/test/test_bug632379.xhtml
--- a/layout/inspector/tests/chrome/chrome.ini
+++ b/layout/inspector/tests/chrome/chrome.ini
@@ -1,34 +1,34 @@
 [DEFAULT]
 skip-if = os == 'android'
 support-files = GentiumPlus-R.woff
 
-[test_bug467669.xul]
+[test_bug467669.xhtml]
 support-files =
   test_bug467669.css
-[test_bug695639.xul]
+[test_bug695639.xhtml]
 support-files =
   test_bug695639.css
-[test_bug708874.xul]
+[test_bug708874.xhtml]
 support-files =
   test_bug708874.css
-[test_bug727834.xul]
+[test_bug727834.xhtml]
 support-files =
   test_bug727834.css
 [test_parseStyleSheetObservers.html]
 support-files =
   imported_no_op.css
-[test_fontFaceRanges.xul]
+[test_fontFaceRanges.xhtml]
 support-files =
   test_fontFaceRanges.css
-[test_fontFeaturesAPI.xul]
+[test_fontFeaturesAPI.xhtml]
 support-files =
   test_fontFeaturesAPI.css
   DejaVuSans.ttf
-[test_fontVariationsAPI.xul]
+[test_fontVariationsAPI.xhtml]
 skip-if = ((os == 'win' && bits!=64) || (os=='linux' && bits==32) || os == 'mac') # bug 1456855, bug 1456856
 support-files =
   test_fontVariationsAPI.css
-[test_fontFaceGeneric.xul]
+[test_fontFaceGeneric.xhtml]
 [test_ua_rule_modification.html]
 [test_ua_sheet_disable.html]
 [test_visited_style.html]
\ No newline at end of file
rename from layout/inspector/tests/chrome/test_bug467669.xul
rename to layout/inspector/tests/chrome/test_bug467669.xhtml
rename from layout/inspector/tests/chrome/test_bug695639.xul
rename to layout/inspector/tests/chrome/test_bug695639.xhtml
rename from layout/inspector/tests/chrome/test_bug708874.xul
rename to layout/inspector/tests/chrome/test_bug708874.xhtml
rename from layout/inspector/tests/chrome/test_bug727834.xul
rename to layout/inspector/tests/chrome/test_bug727834.xhtml
rename from layout/inspector/tests/chrome/test_fontFaceGeneric.xul
rename to layout/inspector/tests/chrome/test_fontFaceGeneric.xhtml
rename from layout/inspector/tests/chrome/test_fontFaceRanges.xul
rename to layout/inspector/tests/chrome/test_fontFaceRanges.xhtml
rename from layout/inspector/tests/chrome/test_fontFeaturesAPI.xul
rename to layout/inspector/tests/chrome/test_fontFeaturesAPI.xhtml
rename from layout/inspector/tests/chrome/test_fontVariationsAPI.xul
rename to layout/inspector/tests/chrome/test_fontVariationsAPI.xhtml
rename from layout/style/test/chrome/bug535806-xul.xul
rename to layout/style/test/chrome/bug535806-xul.xhtml
--- a/layout/style/test/chrome/chrome.ini
+++ b/layout/style/test/chrome/chrome.ini
@@ -1,25 +1,25 @@
 [DEFAULT]
 skip-if = os == 'android'
 support-files =
   bug418986-2.js
   bug535806-css.css
   bug535806-html.html
-  bug535806-xul.xul
+  bug535806-xul.xhtml
   hover_helper.html
   match.png
   mismatch.png
 
 [test_bug1346623.html]
 [test_bug1371453.html]
-[test_bug418986-2.xul]
+[test_bug418986-2.xhtml]
 [test_bug1157097.html]
-[test_bug1160724.xul]
-[test_bug535806.xul]
+[test_bug1160724.xhtml]
+[test_bug535806.xhtml]
 [test_chrome_only_media_queries.html]
 [test_display_mode.html]
 tags = fullscreen
 [test_display_mode_reflow.html]
 tags = fullscreen
 [test_hover.html]
 skip-if = true # bug 1346353
 [test_moz_document_rules.html]
rename from layout/style/test/chrome/test_bug1160724.xul
rename to layout/style/test/chrome/test_bug1160724.xhtml
rename from layout/style/test/chrome/test_bug418986-2.xul
rename to layout/style/test/chrome/test_bug418986-2.xhtml
rename from layout/style/test/chrome/test_bug535806.xul
rename to layout/style/test/chrome/test_bug535806.xhtml
--- a/layout/style/test/chrome/test_bug535806.xul
+++ b/layout/style/test/chrome/test_bug535806.xhtml
@@ -22,17 +22,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   /** Test for Bug 535806 **/
   SimpleTest.waitForExplicitFinish();
 
   window.addEventListener("load", function() {
       $("f").setAttribute("src", "bug535806-html.html");
     }, false);
 
   function htmlLoaded() {
-    $("f").setAttribute("src", "bug535806-xul.xul");
+    $("f").setAttribute("src", "bug535806-xul.xhtml");
   }
 
   function xulLoaded() {
     var doc = $("f").contentDocument;
     is(doc.defaultView.getComputedStyle(doc.getElementById("s")).color,
        "rgb(0, 128, 0)");
     SimpleTest.finish();
   }
--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,40 +1,40 @@
 [DEFAULT]
 skip-if = os == 'android'
 support-files =
-  window_resizer.xul
-  window_resizer_element.xul
-  windowminmaxsize1.xul
-  windowminmaxsize2.xul
-  windowminmaxsize3.xul
-  windowminmaxsize4.xul
-  windowminmaxsize5.xul
-  windowminmaxsize6.xul
-  windowminmaxsize7.xul
-  windowminmaxsize8.xul
-  windowminmaxsize9.xul
-  windowminmaxsize10.xul
-  titledpanelwindow.xul
+  window_resizer.xhtml
+  window_resizer_element.xhtml
+  windowminmaxsize1.xhtml
+  windowminmaxsize2.xhtml
+  windowminmaxsize3.xhtml
+  windowminmaxsize4.xhtml
+  windowminmaxsize5.xhtml
+  windowminmaxsize6.xhtml
+  windowminmaxsize7.xhtml
+  windowminmaxsize8.xhtml
+  windowminmaxsize9.xhtml
+  windowminmaxsize10.xhtml
+  titledpanelwindow.xhtml
 
-[test_bug159346.xul]
-[test_bug372685.xul]
+[test_bug159346.xhtml]
+[test_bug372685.xhtml]
 [test_bug381167.xhtml]
-[test_bug393970.xul]
+[test_bug393970.xhtml]
 skip-if = (verify && debug && (os == 'linux'))
-[test_bug398982-1.xul]
-[test_bug398982-2.xul]
-[test_bug467442.xul]
-[test_bug477754.xul]
-[test_bug703150.xul]
-[test_bug987230.xul]
+[test_bug398982-1.xhtml]
+[test_bug398982-2.xhtml]
+[test_bug467442.xhtml]
+[test_bug477754.xhtml]
+[test_bug703150.xhtml]
+[test_bug987230.xhtml]
 skip-if = os == 'linux' # No native mousedown event on Linux
-[test_bug1197913.xul]
-[test_popupReflowPos.xul]
-[test_popupSizeTo.xul]
-[test_popupZoom.xul]
-[test_resizer.xul]
+[test_bug1197913.xhtml]
+[test_popupReflowPos.xhtml]
+[test_popupSizeTo.xhtml]
+[test_popupZoom.xhtml]
+[test_resizer.xhtml]
 skip-if = (verify && (os == 'win'))
-[test_submenuClose.xul]
-[test_windowminmaxsize.xul]
-[test_resizer_incontent.xul]
-[test_splitter.xul]
+[test_submenuClose.xhtml]
+[test_windowminmaxsize.xhtml]
+[test_resizer_incontent.xhtml]
+[test_splitter.xhtml]
 skip-if = toolkit == 'android' # no XUL theme
rename from layout/xul/test/test_bug1197913.xul
rename to layout/xul/test/test_bug1197913.xhtml
rename from layout/xul/test/test_bug159346.xul
rename to layout/xul/test/test_bug159346.xhtml
rename from layout/xul/test/test_bug372685.xul
rename to layout/xul/test/test_bug372685.xhtml
rename from layout/xul/test/test_bug393970.xul
rename to layout/xul/test/test_bug393970.xhtml
rename from layout/xul/test/test_bug398982-1.xul
rename to layout/xul/test/test_bug398982-1.xhtml
rename from layout/xul/test/test_bug398982-2.xul
rename to layout/xul/test/test_bug398982-2.xhtml
rename from layout/xul/test/test_bug467442.xul
rename to layout/xul/test/test_bug467442.xhtml
rename from layout/xul/test/test_bug477754.xul
rename to layout/xul/test/test_bug477754.xhtml
rename from layout/xul/test/test_bug703150.xul
rename to layout/xul/test/test_bug703150.xhtml
rename from layout/xul/test/test_bug987230.xul
rename to layout/xul/test/test_bug987230.xhtml
rename from layout/xul/test/test_popupReflowPos.xul
rename to layout/xul/test/test_popupReflowPos.xhtml
rename from layout/xul/test/test_popupSizeTo.xul
rename to layout/xul/test/test_popupSizeTo.xhtml
rename from layout/xul/test/test_popupZoom.xul
rename to layout/xul/test/test_popupZoom.xhtml
rename from layout/xul/test/test_resizer.xul
rename to layout/xul/test/test_resizer.xhtml
--- a/layout/xul/test/test_resizer.xul
+++ b/layout/xul/test/test_resizer.xhtml
@@ -63,29 +63,29 @@ XUL <resizer> tests
     function doResizerWindowTests() {
       step++;
       if (step == 1) {
         openPopup();
         return;
       }
 
       if (/Mac/.test(navigator.platform)) {
-        window.openDialog("window_resizer.xul", "_blank", "left=200,top=200,outerWidth=300,outerHeight=300,chrome,noopener", window);
+        window.openDialog("window_resizer.xhtml", "_blank", "left=200,top=200,outerWidth=300,outerHeight=300,chrome,noopener", window);
       }
       else {
-        // Skip window_resizer.xul tests.
+        // Skip window_resizer.xhtml tests.
         todo(false, "We can't test GTK and Windows native drag resizing implementations.");
-        // Run window_resizer_element.xul test only.
+        // Run window_resizer_element.xhtml test only.
         lastResizerTest();
       }
     }
 
     function lastResizerTest()
     {
-      window.openDialog("window_resizer_element.xul", "_blank", "left=200,top=200,outerWidth=300,outerHeight=300,chrome,noopener", window);
+      window.openDialog("window_resizer_element.xhtml", "_blank", "left=200,top=200,outerWidth=300,outerHeight=300,chrome,noopener", window);
     }
 
     SimpleTest.waitForFocus(openPopup);
    ]]></script>
 
 <panel id="panel" onpopupshown="popupShown(event)" onpopuphidden="doResizerWindowTests()">
   <resizer id="resizer" dir="bottomend" width="16" height="16"/>
   <hbox width="50" height="50" flex="1"/>
rename from layout/xul/test/test_resizer_incontent.xul
rename to layout/xul/test/test_resizer_incontent.xhtml
rename from layout/xul/test/test_splitter.xul
rename to layout/xul/test/test_splitter.xhtml
rename from layout/xul/test/test_submenuClose.xul
rename to layout/xul/test/test_submenuClose.xhtml
rename from layout/xul/test/test_windowminmaxsize.xul
rename to layout/xul/test/test_windowminmaxsize.xhtml
--- a/layout/xul/test/test_windowminmaxsize.xul
+++ b/layout/xul/test/test_windowminmaxsize.xhtml
@@ -20,45 +20,45 @@
 SimpleTest.waitForExplicitFinish();
 
 var gTestId = -1;
 
 // width and height in the tests below specify the expected size of the window.
 // note, win8 has a minimum inner window size of around 122 pixels. Don't go below this on min-width tests.
 var tests = [
   { testname: "unconstrained",
-    src: "windowminmaxsize1.xul",
+    src: "windowminmaxsize1.xhtml",
     width: 150, height: 150 },
   { testname: "constraint min style",
-    src: "windowminmaxsize2.xul",
+    src: "windowminmaxsize2.xhtml",
     width: 180, height: 210 },
   { testname: "constraint max style",
-    src: "windowminmaxsize3.xul",
+    src: "windowminmaxsize3.xhtml",
     width: 125, height: 140 },
   { testname: "constraint min attributes",
-    src: "windowminmaxsize4.xul",
+    src: "windowminmaxsize4.xhtml",
     width: 240, height: 220 },
   { testname: "constraint min attributes with width and height set",
-    src: "windowminmaxsize5.xul",
+    src: "windowminmaxsize5.xhtml",
     width: 215, height: 235 },
   { testname: "constraint max attributes",
-    src: "windowminmaxsize6.xul",
+    src: "windowminmaxsize6.xhtml",
     width: 125, height: 95 },
   // this gets the inner width as <window minwidth='210'> makes the box 210 pixels wide
   { testname: "constraint min width attribute only",
-    src: "windowminmaxsize7.xul",
+    src: "windowminmaxsize7.xhtml",
     width: 210, height: 150 },
   { testname: "constraint max width attribute only",
-    src: "windowminmaxsize8.xul",
+    src: "windowminmaxsize8.xhtml",
     width: 128, height: 150 },
   { testname: "constraint max width attribute with minheight",
-    src: "windowminmaxsize9.xul",
+    src: "windowminmaxsize9.xhtml",
     width: 195, height: 180 },
   { testname: "constraint minwidth, minheight, maxwidth and maxheight set",
-    src: "windowminmaxsize10.xul",
+    src: "windowminmaxsize10.xhtml",
     width: 150, height: 150, last: true }
 ];
 
 var popupTests = [
   { testname: "popup unconstrained",
     width: 60, height: 60
   },
   { testname: "popup with minimum size",
@@ -164,17 +164,17 @@ function doPanelTest(panel)
   panel.hidePopup();
 }
 
 function nextPopupTest(panel)
 {
   if (++gTestId >= popupTests.length) {
     // Next, check a panel that has a titlebar to ensure that it is accounted for
     // properly in the size.
-    var titledPanelWindow = docShell.rootTreeItem.domWindow.open("titledpanelwindow.xul", "_blank", "chrome,resizable=yes");
+    var titledPanelWindow = docShell.rootTreeItem.domWindow.open("titledpanelwindow.xhtml", "_blank", "chrome,resizable=yes");
     SimpleTest.waitForFocus(titledPanelWindowOpened, titledPanelWindow);
   }
   else {
     function setattr(attr) {
       if (attr in popupTests[gTestId])
         panel.setAttribute(attr, popupTests[gTestId][attr]);
       else
         panel.removeAttribute(attr);
rename from layout/xul/test/titledpanelwindow.xul
rename to layout/xul/test/titledpanelwindow.xhtml
rename from layout/xul/test/window_resizer.xul
rename to layout/xul/test/window_resizer.xhtml
--- a/layout/xul/test/window_resizer.xul
+++ b/layout/xul/test/window_resizer.xhtml
@@ -2,17 +2,17 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     screenX="200" screenY="200" width="300" height="300"
 	onload="setTimeout(doTest, 0)">
 <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
 <script><![CDATA[
 var is = window.arguments[0].SimpleTest.is;
 
 function doTest() {
-  // from test_resizer.xul
+  // from test_resizer.xhtml
   var expectX = 200;
   var expectY = 200;
   var expectXMost = 500;
   var expectYMost = 500;
   var screenScale = expectX/window.screenX;
   var root = document.documentElement;
 
   var oldScreenX = window.screenX;
rename from layout/xul/test/window_resizer_element.xul
rename to layout/xul/test/window_resizer_element.xhtml
rename from layout/xul/test/windowminmaxsize1.xul
rename to layout/xul/test/windowminmaxsize1.xhtml
rename from layout/xul/test/windowminmaxsize10.xul
rename to layout/xul/test/windowminmaxsize10.xhtml
rename from layout/xul/test/windowminmaxsize2.xul
rename to layout/xul/test/windowminmaxsize2.xhtml
rename from layout/xul/test/windowminmaxsize3.xul
rename to layout/xul/test/windowminmaxsize3.xhtml
rename from layout/xul/test/windowminmaxsize4.xul
rename to layout/xul/test/windowminmaxsize4.xhtml
rename from layout/xul/test/windowminmaxsize5.xul
rename to layout/xul/test/windowminmaxsize5.xhtml
rename from layout/xul/test/windowminmaxsize6.xul
rename to layout/xul/test/windowminmaxsize6.xhtml
rename from layout/xul/test/windowminmaxsize7.xul
rename to layout/xul/test/windowminmaxsize7.xhtml
rename from layout/xul/test/windowminmaxsize8.xul
rename to layout/xul/test/windowminmaxsize8.xhtml
rename from layout/xul/test/windowminmaxsize9.xul
rename to layout/xul/test/windowminmaxsize9.xhtml