Bug 1596327, rename .xul test files in widget/ to .xhtml r=jmathies

Differential Revision: https://phabricator.services.mozilla.com/D53047

--HG--
rename : widget/cocoa/crashtests/444260-1.xul => widget/cocoa/crashtests/444260-1.xhtml
rename : widget/tests/bug586713_window.xul => widget/tests/bug586713_window.xhtml
rename : widget/tests/chrome_context_menus_win.xul => widget/tests/chrome_context_menus_win.xhtml
rename : widget/tests/empty_window.xul => widget/tests/empty_window.xhtml
rename : widget/tests/native_menus_window.xul => widget/tests/native_menus_window.xhtml
rename : widget/tests/native_mouse_mac_window.xul => widget/tests/native_mouse_mac_window.xhtml
rename : widget/tests/standalone_native_menu_window.xul => widget/tests/standalone_native_menu_window.xhtml
rename : widget/tests/system_font_changes.xul => widget/tests/system_font_changes.xhtml
rename : widget/tests/taskbar_previews.xul => widget/tests/taskbar_previews.xhtml
rename : widget/tests/test_bug1123480.xul => widget/tests/test_bug1123480.xhtml
rename : widget/tests/test_bug343416.xul => widget/tests/test_bug343416.xhtml
rename : widget/tests/test_bug428405.xul => widget/tests/test_bug428405.xhtml
rename : widget/tests/test_bug429954.xul => widget/tests/test_bug429954.xhtml
rename : widget/tests/test_bug444800.xul => widget/tests/test_bug444800.xhtml
rename : widget/tests/test_bug466599.xul => widget/tests/test_bug466599.xhtml
rename : widget/tests/test_bug478536.xul => widget/tests/test_bug478536.xhtml
rename : widget/tests/test_bug485118.xul => widget/tests/test_bug485118.xhtml
rename : widget/tests/test_bug517396.xul => widget/tests/test_bug517396.xhtml
rename : widget/tests/test_bug522217.xul => widget/tests/test_bug522217.xhtml
rename : widget/tests/test_bug538242.xul => widget/tests/test_bug538242.xhtml
rename : widget/tests/test_bug586713.xul => widget/tests/test_bug586713.xhtml
rename : widget/tests/test_bug593307.xul => widget/tests/test_bug593307.xhtml
rename : widget/tests/test_bug596600.xul => widget/tests/test_bug596600.xhtml
rename : widget/tests/test_bug673301.xul => widget/tests/test_bug673301.xhtml
rename : widget/tests/test_bug760802.xul => widget/tests/test_bug760802.xhtml
rename : widget/tests/test_chrome_context_menus_win.xul => widget/tests/test_chrome_context_menus_win.xhtml
rename : widget/tests/test_clipboard.xul => widget/tests/test_clipboard.xhtml
rename : widget/tests/test_composition_text_querycontent.xul => widget/tests/test_composition_text_querycontent.xhtml
rename : widget/tests/test_input_events_on_deactive_window.xul => widget/tests/test_input_events_on_deactive_window.xhtml
rename : widget/tests/test_key_event_counts.xul => widget/tests/test_key_event_counts.xhtml
rename : widget/tests/test_keycodes.xul => widget/tests/test_keycodes.xhtml
rename : widget/tests/test_mouse_scroll.xul => widget/tests/test_mouse_scroll.xhtml
rename : widget/tests/test_native_menus.xul => widget/tests/test_native_menus.xhtml
rename : widget/tests/test_native_mouse_mac.xul => widget/tests/test_native_mouse_mac.xhtml
rename : widget/tests/test_panel_mouse_coords.xul => widget/tests/test_panel_mouse_coords.xhtml
rename : widget/tests/test_platform_colors.xul => widget/tests/test_platform_colors.xhtml
rename : widget/tests/test_position_on_resize.xul => widget/tests/test_position_on_resize.xhtml
rename : widget/tests/test_sizemode_events.xul => widget/tests/test_sizemode_events.xhtml
rename : widget/tests/test_standalone_native_menu.xul => widget/tests/test_standalone_native_menu.xhtml
rename : widget/tests/test_system_font_changes.xul => widget/tests/test_system_font_changes.xhtml
rename : widget/tests/test_system_status_bar.xul => widget/tests/test_system_status_bar.xhtml
rename : widget/tests/test_taskbar_progress.xul => widget/tests/test_taskbar_progress.xhtml
rename : widget/tests/test_transferable_overflow.xul => widget/tests/test_transferable_overflow.xhtml
rename : widget/tests/test_wheeltransaction.xul => widget/tests/test_wheeltransaction.xhtml
rename : widget/tests/window_bug429954.xul => widget/tests/window_bug429954.xhtml
rename : widget/tests/window_bug478536.xul => widget/tests/window_bug478536.xhtml
rename : widget/tests/window_bug522217.xul => widget/tests/window_bug522217.xhtml
rename : widget/tests/window_bug538242.xul => widget/tests/window_bug538242.xhtml
rename : widget/tests/window_bug593307_centerscreen.xul => widget/tests/window_bug593307_centerscreen.xhtml
rename : widget/tests/window_bug593307_offscreen.xul => widget/tests/window_bug593307_offscreen.xhtml
rename : widget/tests/window_composition_text_querycontent.xul => widget/tests/window_composition_text_querycontent.xhtml
rename : widget/tests/window_state_windows.xul => widget/tests/window_state_windows.xhtml
rename : widget/tests/window_wheeltransaction.xul => widget/tests/window_wheeltransaction.xhtml
extra : moz-landing-system : lando

.eslintrc.js

@@ -420,6 +420,64 @@ module.exports = {
       "object-shorthand": "off",
       "no-undef": "off",
     }
+  }, {
+    "files": [
+      "widget/tests/native_menus_window.xhtml",
+      "widget/tests/native_mouse_mac_window.xhtml",
+      "widget/tests/standalone_native_menu_window.xhtml",
+      "widget/tests/system_font_changes.xhtml",
+      "widget/tests/taskbar_previews.xhtml",
+      "widget/tests/test_bug1123480.xhtml",
+      "widget/tests/test_bug343416.xhtml",
+      "widget/tests/test_bug428405.xhtml",
+      "widget/tests/test_bug429954.xhtml",
+      "widget/tests/test_bug466599.xhtml",
+      "widget/tests/test_bug485118.xhtml",
+      "widget/tests/test_bug517396.xhtml",
+      "widget/tests/test_bug538242.xhtml",
+      "widget/tests/test_bug596600.xhtml",
+      "widget/tests/test_bug673301.xhtml",
+      "widget/tests/test_bug760802.xhtml",
+      "widget/tests/test_chrome_context_menus_win.xhtml",
+      "widget/tests/test_clipboard.xhtml",
+      "widget/tests/test_input_events_on_deactive_window.xhtml",
+      "widget/tests/test_key_event_counts.xhtml",
+      "widget/tests/test_keycodes.xhtml",
+      "widget/tests/test_panel_mouse_coords.xhtml",
+      "widget/tests/test_position_on_resize.xhtml",
+      "widget/tests/test_sizemode_events.xhtml",
+      "widget/tests/test_taskbar_progress.xhtml",
+      "widget/tests/test_transferable_overflow.xhtml",
+      "widget/tests/window_bug429954.xhtml",
+      "widget/tests/window_bug478536.xhtml",
+      "widget/tests/window_composition_text_querycontent.xhtml",
+      "widget/tests/window_state_windows.xhtml",
+      "widget/tests/window_wheeltransaction.xhtml",
+    ],
+    "rules": {
+      "complexity": "off",
+      "consistent-return": "off",
+      "dot-notation": "off",
+      "mozilla/prefer-boolean-length-check": "off",
+      "mozilla/no-useless-parameters": "off",
+      "mozilla/no-useless-removeEventListener": "off",
+      "mozilla/use-cc-etc": "off",
+      "mozilla/use-chromeutils-generateqi": "off",
+      "mozilla/use-services": "off",
+      "object-shorthand": "off",
+      "no-caller": "off",
+      "no-delete-var": "off",
+      "no-nested-ternary": "off",
+      "no-new-object": "off",
+      "no-redeclare": "off",
+      "no-sequences": "off",
+      "no-shadow": "off",
+      "no-undef": "off",
+      "no-unsafe-finally": "off",
+      "no-unsanitized/property": "off",
+      "no-unused-vars": "off",
+      "no-useless-return": "off",
+    }
   }, {
     "files": [
       "toolkit/components/aboutmemory/tests/test_aboutmemory.xhtml",

widget/cocoa/crashtests/crashtests.list

@@ -3,7 +3,7 @@ load 397209-1.html
 load 403296-1.xhtml
 load 419737-1.html
 load 435223-1.html
-load chrome://reftest/content/crashtests/widget/cocoa/crashtests/444260-1.xul
+load chrome://reftest/content/crashtests/widget/cocoa/crashtests/444260-1.xhtml
 load 444864-1.html
 load 449111-1.html
 load 460349-1.xhtml

widget/tests/browser/browser_test_clipboardcache.js

@@ -6,7 +6,7 @@ const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 
-// Note: widget/tests/test_bug1123480.xul checks whether nsTransferable behaves
+// Note: widget/tests/test_bug1123480.xhtml checks whether nsTransferable behaves
 // as expected with regards to private browsing mode and the clipboard cache,
 // i.e. that the clipboard is not cached to the disk when private browsing mode
 // is enabled.

widget/tests/chrome.ini

@@ -3,85 +3,85 @@ prefs =
   plugin.load_flash_only=false
 skip-if = os == 'android'
 support-files =
-  empty_window.xul
+  empty_window.xhtml
   utils.js
 
-[test_bug343416.xul]
+[test_bug343416.xhtml]
 skip-if = debug
-[test_bug429954.xul]
-support-files = window_bug429954.xul
-[test_bug444800.xul]
+[test_bug429954.xhtml]
+support-files = window_bug429954.xhtml
+[test_bug444800.xhtml]
 tags = clipboard
-[test_bug478536.xul]
+[test_bug478536.xhtml]
 skip-if = true # Bug 561929
-support-files = window_bug478536.xul
-[test_bug517396.xul]
+support-files = window_bug478536.xhtml
+[test_bug517396.xhtml]
 skip-if = (verify && (os == 'win'))
-[test_bug538242.xul]
-support-files = window_bug538242.xul
+[test_bug538242.xhtml]
+support-files = window_bug538242.xhtml
 [test_bug565392.html]
 tags = clipboard
 skip-if = toolkit != "windows"
-[test_bug593307.xul]
-support-files = window_bug593307_offscreen.xul window_bug593307_centerscreen.xul
+[test_bug593307.xhtml]
+support-files = window_bug593307_offscreen.xhtml window_bug593307_centerscreen.xhtml
 [test_bug1151186.html]
 skip-if = os == 'linux' && debug #Bug 1176038
-[test_keycodes.xul]
-[test_wheeltransaction.xul]
-support-files = window_wheeltransaction.xul
+[test_keycodes.xhtml]
+[test_wheeltransaction.xhtml]
+support-files = window_wheeltransaction.xhtml
 [test_imestate.html]
 support-files = window_imestate_iframes.html
 [test_plugin_scroll_consistency.html]
-[test_composition_text_querycontent.xul]
-support-files = window_composition_text_querycontent.xul
-[test_input_events_on_deactive_window.xul]
+[test_composition_text_querycontent.xhtml]
+support-files = window_composition_text_querycontent.xhtml
+[test_input_events_on_deactive_window.xhtml]
 support-files = file_input_events_on_deactive_window.html
-[test_position_on_resize.xul]
+[test_position_on_resize.xhtml]
 skip-if = (verify && (os == 'win'))
-[test_sizemode_events.xul]
-[test_taskbar_progress.xul]
+[test_sizemode_events.xhtml]
+[test_taskbar_progress.xhtml]
 skip-if = toolkit != "cocoa" && toolkit != "windows" || (os == "win" && os_version == "10.0" && !ccov) # Bug 1456811
-[test_bug760802.xul]
-[test_clipboard.xul]
+[test_bug760802.xhtml]
+[test_clipboard.xhtml]
 tags = clipboard
-[test_panel_mouse_coords.xul]
+[test_panel_mouse_coords.xhtml]
 skip-if = toolkit == "windows" # bug 1009955
 
 # Cocoa
-[test_native_menus.xul]
+[test_native_menus.xhtml]
 skip-if = toolkit != "cocoa"
-support-files = native_menus_window.xul
-[test_native_mouse_mac.xul]
+support-files = native_menus_window.xhtml
+[test_native_mouse_mac.xhtml]
 skip-if = toolkit != "cocoa" || os_version == '10.14' # macosx1014: bug 1137575
-support-files = native_mouse_mac_window.xul
+support-files = native_mouse_mac_window.xhtml
 [test_bug413277.html]
 skip-if = toolkit != "cocoa"
-[test_bug428405.xul]
+[test_bug428405.xhtml]
 skip-if = toolkit != "cocoa"
-[test_bug466599.xul]
+[test_bug466599.xhtml]
 tags = clipboard
 skip-if = toolkit != "cocoa"
-[test_bug485118.xul]
+[test_bug485118.xhtml]
 skip-if = toolkit != "cocoa"
-[test_bug522217.xul]
+[test_bug522217.xhtml]
 tags = fullscreen
 skip-if = toolkit != "cocoa"
-support-files = window_bug522217.xul
-[test_platform_colors.xul]
+support-files = window_bug522217.xhtml
+[test_platform_colors.xhtml]
 #skip-if = toolkit != "cocoa"
 skip-if = true # Bug 1207190
-[test_standalone_native_menu.xul]
+[test_standalone_native_menu.xhtml]
 skip-if = toolkit != "cocoa"
-support-files = standalone_native_menu_window.xul
-[test_bug586713.xul]
+support-files = standalone_native_menu_window.xhtml
+[test_bug586713.xhtml]
 skip-if = toolkit != "cocoa"
-support-files = bug586713_window.xul
-[test_key_event_counts.xul]
+support-files = bug586713_window.xhtml
+[test_key_event_counts.xhtml]
 skip-if = toolkit != "cocoa"
-[test_bug596600.xul]
+[test_bug596600.xhtml]
 support-files = file_bug596600.html
 skip-if = toolkit != "cocoa"
-[test_bug673301.xul]
+[test_bug673301.xhtml]
 tags = clipboard
 skip-if = toolkit != "cocoa"
 [test_secure_input.html]
@@ -89,29 +89,29 @@ support-files = file_secure_input.html
 skip-if = toolkit != "cocoa"
 [test_native_key_bindings_mac.html]
 skip-if = toolkit != "cocoa" || verify
-[test_system_status_bar.xul]
+[test_system_status_bar.xhtml]
 skip-if = toolkit != "cocoa"
 
-[test_system_font_changes.xul]
-support-files = system_font_changes.xul
+[test_system_font_changes.xhtml]
+support-files = system_font_changes.xhtml
 run-if = toolkit == 'gtk' # Currently the test works on only gtk3
 
 # Windows
-# taskbar_previews.xul
-# window_state_windows.xul
-[test_chrome_context_menus_win.xul]
+# taskbar_previews.xhtml
+# window_state_windows.xhtml
+[test_chrome_context_menus_win.xhtml]
 skip-if = toolkit != "windows"
-support-files = chrome_context_menus_win.xul
+support-files = chrome_context_menus_win.xhtml
 [test_plugin_input_event.html]
 skip-if = toolkit != "windows"
-[test_mouse_scroll.xul]
+[test_mouse_scroll.xhtml]
 skip-if = toolkit != "windows"
 support-files = window_mouse_scroll_win.html
 
 # Privacy relevant
-[test_bug1123480.xul]
+[test_bug1123480.xhtml]
 tags = clipboard
-[test_transferable_overflow.xul]
+[test_transferable_overflow.xhtml]
 skip-if = (verify && (os == 'mac' || os == 'linux'))
 tags = clipboard
 

widget/tests/moz.build

@@ -70,7 +70,7 @@ with Files("*673301*"):
 with Files("test_assign_event_data.html"):
     BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling")
 
-with Files("test_input_events_on_deactive_window.xul"):
+with Files("test_input_events_on_deactive_window.xhtml"):
     BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling")
 
 with Files("*chrome_context_menus_win*"):
@@ -106,7 +106,7 @@ with Files("*plugin*"):
 with Files("*position_on_resize*"):
     BUG_COMPONENT = ("Core", "Widget: Gtk")
 
-with Files("test_sizemode_events.xul"):
+with Files("test_sizemode_events.xhtml"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 
 with Files("*system_status_bar*"):

widget/tests/standalone_native_menu_window.xhtml

@@ -126,6 +126,7 @@
 
         let menuitem = document.createElementNS(XUL_NS, "menuitem");
         menuitem.setAttribute("label", "detached menu item");
+        /* eslint-disable-next-line no-shadow */
         menuitem.addEventListener("command", function (e) {
           itemActivated = true;
         })

widget/tests/test_bug343416.xhtml

@@ -146,6 +146,7 @@ ok(removedObserver, "The nsIIdleService should allow us to remove the observer j
 
 function testIdleTime()
 {
+    /* eslint-disable-next-line no-shadow */
     var gotIdleTime = false
     try
     {

widget/tests/test_bug429954.xhtml

@@ -32,7 +32,7 @@ SimpleTest.waitForFocus(function () {
   var maxWidth = win.outerWidth, maxHeight = win.outerHeight;
   win.restore();
 
-  window.openDialog("window_bug429954.xul", "_blank", 
+  window.openDialog("window_bug429954.xhtml", "_blank", 
                     "chrome,noopener,resizable,width=" + maxWidth + ",height=" + maxHeight +
                     ",screenX=" + maxX + "screenY=" + maxY,
                     window);

widget/tests/test_bug478536.xhtml

@@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478536
 <![CDATA[
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("window_bug478536.xul", "_blank", 
+window.openDialog("window_bug478536.xhtml", "_blank", 
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/test_bug522217.xhtml

@@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=522217
 SimpleTest.waitForExplicitFinish();
 
 SimpleTest.waitForFocus(function () {
-  window.openDialog("window_bug522217.xul", "_blank", 
+  window.openDialog("window_bug522217.xhtml", "_blank", 
                     "chrome,resizable,width=400,height=300,noopener", window);
 });
 

widget/tests/test_bug538242.xhtml

@@ -35,7 +35,7 @@ SimpleTest.waitForFocus(function () {
   }
 
   var win = docShell.rootTreeItem.domWindow.open(
-      "window_bug538242.xul", "_blank", 
+      "window_bug538242.xhtml", "_blank", 
       "chrome,width=400,height=300,left=100,top=100");
   SimpleTest.waitForFocus(function () {
     is(win.screenX, 100, "window should open at 100, 100");

widget/tests/test_bug586713.xhtml

@@ -20,7 +20,7 @@
 <![CDATA[
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("bug586713_window.xul", "bug586713_window", 
+window.openDialog("bug586713_window.xhtml", "bug586713_window", 
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/test_bug593307.xhtml

@@ -30,7 +30,7 @@ function finish() {
 
 var mainWindow = window.docShell.rootTreeItem.domWindow;
 
-var offscreenWindow = mainWindow.openDialog("window_bug593307_offscreen.xul", "",
+var offscreenWindow = mainWindow.openDialog("window_bug593307_offscreen.xhtml", "",
                                             "dialog=no,chrome,width=200,height=200,screenX=-3000,screenY=-3000",
                                             SimpleTest, finish);
 

widget/tests/test_bug596600.xhtml

@@ -33,10 +33,10 @@ function moveMouseTo(x, y, andThen) {
 
 function openWindows() {
   gLeftWindow = window.docShell.rootTreeItem.domWindow
-                      .open('empty_window.xul', '_blank', 'chrome,screenX=50,screenY=50,width=200,height=200');
+                      .open('empty_window.xhtml', '_blank', 'chrome,screenX=50,screenY=50,width=200,height=200');
   SimpleTest.waitForFocus(function () {
     gRightWindow = window.docShell.rootTreeItem.domWindow
-                         .open('empty_window.xul', '', 'chrome,screenX=300,screenY=50,width=200,height=200');
+                         .open('empty_window.xhtml', '', 'chrome,screenX=300,screenY=50,width=200,height=200');
     SimpleTest.waitForFocus(attachBrowserToLeftWindow, gRightWindow);
   }, gLeftWindow);
 }

widget/tests/test_chrome_context_menus_win.xhtml

@@ -14,7 +14,7 @@
     SimpleTest.waitForExplicitFinish();
 
     var w = docShell.rootTreeItem.domWindow.openDialog(
-        'chrome_context_menus_win.xul', '_blank', 'chrome,resizable=yes,width=600,height=600', window);
+        'chrome_context_menus_win.xhtml', '_blank', 'chrome,resizable=yes,width=600,height=600', window);
 
     function done()
     {

widget/tests/test_composition_text_querycontent.xhtml

@@ -25,7 +25,7 @@
 // Strangely, this doesn't occur with RDP on Windows.
 SimpleTest.expectAssertions(0, 3);
 SimpleTest.waitForExplicitFinish();
-window.openDialog("window_composition_text_querycontent.xul", "_blank", 
+window.openDialog("window_composition_text_querycontent.xhtml", "_blank", 
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/test_keycodes.xhtml

@@ -196,6 +196,7 @@ function* runKeyEventTests()
 
   function onKeyEvent(e)
   {
+    /* eslint-disable-next-line no-shadow */
     function removeFlag(e, aFlag)
     {
       if (e.type == "keydown") {
@@ -210,6 +211,7 @@ function* runKeyEventTests()
       return false;
     }
 
+    /* eslint-disable-next-line no-shadow */
     function isStateChangingModifierKeyEvent(e)
     {
       var flags = 0;
@@ -4977,6 +4979,7 @@ function* runXULKeyTests()
       keyElement.setAttribute("command", "expectedCommand");
     }
 
+    /* eslint-disable-next-line no-shadow */
     for (var id in commandElements) {
       commandElements[id].activeCount = 0;
     }
@@ -5194,6 +5197,7 @@ function* runReservedKeyTests()
 
   function finializeKeyElementTest()
   {
+    /* eslint-disable-next-line no-shadow */
     for (var i = 0; i < contents.length; i++) {
       contents[i].removeEventListener("keydown", onKeyInDefaultEventGroup, true);
       contents[i].removeEventListener("keypress", onKeyInDefaultEventGroup, true);
@@ -5265,10 +5269,12 @@ function* runTextInputTests()
     textbox.value = "";
     textbox.focus();
 
+    /* eslint-disable-next-line no-shadow */
     var currentTestName = eventToString(aEvent);
 
     // Check if the text comes with keypress events rather than composition events.
     var keypress = 0;
+    /* eslint-disable-next-line no-shadow */
     function onKeypress(aEvent) {
       keypress++;
       if (keypress == 1 && aExpectText == "") {

widget/tests/test_native_menus.xhtml

@@ -20,7 +20,7 @@
 <![CDATA[
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("native_menus_window.xul", "NativeMenuWindow", 
+window.openDialog("native_menus_window.xhtml", "NativeMenuWindow", 
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/test_native_mouse_mac.xhtml

@@ -20,7 +20,7 @@
 <![CDATA[
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("native_mouse_mac_window.xul", "NativeMouseWindow",
+window.openDialog("native_mouse_mac_window.xhtml", "NativeMouseWindow",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/test_sizemode_events.xhtml

@@ -57,7 +57,7 @@ function startTest() {
 
 function openWindow() {
   gWindow = window.docShell.rootTreeItem.domWindow
-                  .open('empty_window.xul', '_blank', 'chrome,screenX=50,screenY=50,width=200,height=200,resizable');
+                  .open('empty_window.xhtml', '_blank', 'chrome,screenX=50,screenY=50,width=200,height=200,resizable');
   SimpleTest.waitForFocus(runTest, gWindow);
 }
 

widget/tests/test_standalone_native_menu.xhtml

@@ -20,7 +20,7 @@
 <![CDATA[
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("standalone_native_menu_window.xul", "StandaloneNativeMenuWindow", 
+window.openDialog("standalone_native_menu_window.xhtml", "StandaloneNativeMenuWindow", 
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/test_system_font_changes.xhtml

@@ -19,7 +19,7 @@
 <![CDATA[
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("system_font_changes.xul", "system_font_changes_window",
+window.openDialog("system_font_changes.xhtml", "system_font_changes_window",
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/test_transferable_overflow.xhtml

@@ -47,7 +47,7 @@
     // that the deletion might not be immediate.
     //
     // To avoid intermittents, we only check the file descriptor counts on non-Windows.
-    // test_bug1123480.xul will do some basic testing for Windows.
+    // test_bug1123480.xhtml will do some basic testing for Windows.
     const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
     return AppConstants.platform !== 'win';
   }

widget/tests/test_wheeltransaction.xhtml

@@ -19,7 +19,7 @@
 <![CDATA[
 
 SimpleTest.waitForExplicitFinish();
-window.openDialog("window_wheeltransaction.xul", "_blank", 
+window.openDialog("window_wheeltransaction.xhtml", "_blank", 
                   "chrome,width=600,height=600,noopener", window);
 
 ]]>

widget/tests/window_bug593307_offscreen.xhtml

@@ -19,7 +19,7 @@ var finish = window.arguments[1];
 
 function onLoad()
 {
-  centerscreen = window.openDialog('window_bug593307_centerscreen.xul','', 'chrome,centerscreen,dependent,dialog=no');
+  centerscreen = window.openDialog('window_bug593307_centerscreen.xhtml','', 'chrome,centerscreen,dependent,dialog=no');
 }
 
 function finished() {