Bug 1596869, rename .xul files in security/manager to .xhtml r=keeler
☠☠ backed out by f2ecc55dcad1 ☠ ☠
authorEmma Malysz <emalysz@mozilla.com>
Fri, 22 Nov 2019 21:17:33 +0000
changeset 503528 f90a969f785c9c432afa78a58be7cf08ca20c450
parent 503527 d20b7b5518c630581a975bb9e143c6631a5e7bca
child 503529 e9dba3936b6e1e060b09198ba288e5940c11b331
push id36836
push useraiakab@mozilla.com
push dateSat, 23 Nov 2019 21:49:00 +0000
treeherdermozilla-central@d2d4fba86fce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1596869
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 1596869, rename .xul files in security/manager to .xhtml r=keeler Differential Revision: https://phabricator.services.mozilla.com/D54198
browser/actors/NetErrorParent.jsm
browser/base/content/pageinfo/security.js
browser/base/content/test/static/browser_all_files_referenced.js
browser/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js
browser/components/preferences/in-content/privacy.js
browser/components/preferences/in-content/tests/browser_cert_export.js
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
security/manager/locales/en-US/chrome/pippki/pippki.dtd
security/manager/pki/nsNSSDialogs.cpp
security/manager/pki/resources/content/certManager.js
security/manager/pki/resources/content/certManager.xhtml
security/manager/pki/resources/content/certManager.xul
security/manager/pki/resources/content/certViewer.js
security/manager/pki/resources/content/certViewer.xhtml
security/manager/pki/resources/content/certViewer.xul
security/manager/pki/resources/content/changepassword.xhtml
security/manager/pki/resources/content/changepassword.xul
security/manager/pki/resources/content/clientauthask.js
security/manager/pki/resources/content/clientauthask.xhtml
security/manager/pki/resources/content/clientauthask.xul
security/manager/pki/resources/content/deletecert.js
security/manager/pki/resources/content/deletecert.xhtml
security/manager/pki/resources/content/deletecert.xul
security/manager/pki/resources/content/device_manager.js
security/manager/pki/resources/content/device_manager.xhtml
security/manager/pki/resources/content/device_manager.xul
security/manager/pki/resources/content/downloadcert.js
security/manager/pki/resources/content/downloadcert.xhtml
security/manager/pki/resources/content/downloadcert.xul
security/manager/pki/resources/content/editcacert.xhtml
security/manager/pki/resources/content/editcacert.xul
security/manager/pki/resources/content/exceptionDialog.xhtml
security/manager/pki/resources/content/exceptionDialog.xul
security/manager/pki/resources/content/load_device.js
security/manager/pki/resources/content/load_device.xhtml
security/manager/pki/resources/content/load_device.xul
security/manager/pki/resources/content/pippki.js
security/manager/pki/resources/content/protectedAuth.xhtml
security/manager/pki/resources/content/protectedAuth.xul
security/manager/pki/resources/content/resetpassword.xhtml
security/manager/pki/resources/content/resetpassword.xul
security/manager/pki/resources/content/setp12password.js
security/manager/pki/resources/content/setp12password.xhtml
security/manager/pki/resources/content/setp12password.xul
security/manager/pki/resources/jar.mn
security/manager/ssl/tests/mochitest/browser/browser_certViewer.js
security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js
security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
toolkit/components/certviewer/tests/browser/browser_openTabAndSendCertInfo.js
--- a/browser/actors/NetErrorParent.jsm
+++ b/browser/actors/NetErrorParent.jsm
@@ -344,17 +344,17 @@ class NetErrorParent extends JSWindowAct
               certsStringURL = certsStringURL.join("&");
               let url = `about:certificate?${certsStringURL}`;
               if (window.openTrustedLinkIn) {
                 window.openTrustedLinkIn(url, "tab");
               }
             } else {
               Services.ww.openWindow(
                 window,
-                "chrome://pippki/content/certViewer.xul",
+                "chrome://pippki/content/certViewer.xhtml",
                 "_blank",
                 "centerscreen,chrome",
                 cert
               );
             }
             break;
           }
         }
--- a/browser/base/content/pageinfo/security.js
+++ b/browser/base/content/pageinfo/security.js
@@ -38,17 +38,17 @@ var security = {
       );
       let certsStringURL = certs.map(elem => `cert=${elem}`);
       certsStringURL = certsStringURL.join("&");
       let url = `about:certificate?${certsStringURL}`;
       openTrustedLinkIn(url, "tab");
     } else {
       Services.ww.openWindow(
         window,
-        "chrome://pippki/content/certViewer.xul",
+        "chrome://pippki/content/certViewer.xhtml",
         "_blank",
         "centerscreen,chrome",
         this.securityInfo.cert
       );
     }
   },
 
   async _getSecurityInfo() {
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -67,17 +67,17 @@ if (AppConstants.platform == "macosx") {
 // referencing the whitelisted file in a way that the test can't detect, or a
 // bug number to remove or use the file if it is indeed currently unreferenced.
 var whitelist = [
   // browser/extensions/pdfjs/content/PdfStreamConverter.jsm
   { file: "chrome://pdf.js/locale/chrome.properties" },
   { file: "chrome://pdf.js/locale/viewer.properties" },
 
   // security/manager/pki/resources/content/device_manager.js
-  { file: "chrome://pippki/content/load_device.xul" },
+  { file: "chrome://pippki/content/load_device.xhtml" },
 
   // The l10n build system can't package string files only for some platforms.
   // See bug 1339424 for why this is hard to fix.
   {
     file: "chrome://global/locale/fallbackMenubar.properties",
     platforms: ["linux", "win"],
   },
   {
@@ -182,17 +182,17 @@ var whitelist = [
     file: "chrome://mozapps/skin/downloads/buttons.png",
     platforms: ["macosx"],
   },
   {
     file: "chrome://mozapps/skin/downloads/downloadButtons.png",
     platforms: ["linux", "win"],
   },
   // Bug 1348559
-  { file: "chrome://pippki/content/resetpassword.xul" },
+  { file: "chrome://pippki/content/resetpassword.xhtml" },
   // Bug 1337345
   { file: "resource://gre/modules/Manifest.jsm" },
   // Bug 1356045
   { file: "chrome://global/content/test-ipc.xul" },
   // Bug 1378173 (warning: still used by devtools)
   { file: "resource://gre/modules/Promise.jsm" },
   // Bug 1494170
   // (The references to these files are dynamically generated, so the test can't
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js
@@ -5,17 +5,17 @@
 
 const MASTER_PASSWORD = "omgsecret!";
 const mpToken = Cc["@mozilla.org/security/pk11tokendb;1"]
   .getService(Ci.nsIPK11TokenDB)
   .getInternalKeyToken();
 
 async function checkDeviceManager({ buttonIsDisabled }) {
   let deviceManagerWindow = window.openDialog(
-    "chrome://pippki/content/device_manager.xul",
+    "chrome://pippki/content/device_manager.xhtml",
     "",
     ""
   );
   await BrowserTestUtils.waitForEvent(deviceManagerWindow, "load");
 
   let tree = deviceManagerWindow.document.getElementById("device_tree");
   ok(tree, "The device tree exists");
 
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -2139,24 +2139,24 @@ var gPrivacyPane = {
     var defaultValue = defaults.getIntPref("security.OCSP.enabled");
     return checkbox.checked ? defaultValue : 0;
   },
 
   /**
    * Displays the user's certificates and associated options.
    */
   showCertificates() {
-    gSubDialog.open("chrome://pippki/content/certManager.xul");
+    gSubDialog.open("chrome://pippki/content/certManager.xhtml");
   },
 
   /**
    * Displays a dialog from which the user can manage his security devices.
    */
   showSecurityDevices() {
-    gSubDialog.open("chrome://pippki/content/device_manager.xul");
+    gSubDialog.open("chrome://pippki/content/device_manager.xhtml");
   },
 
   initDataCollection() {
     this._setupLearnMoreLink(
       "toolkit.datacollection.infoURL",
       "dataCollectionPrivacyNotice"
     );
   },
--- a/browser/components/preferences/in-content/tests/browser_cert_export.js
+++ b/browser/components/preferences/in-content/tests/browser_cert_export.js
@@ -42,17 +42,17 @@ var expectedCert;
 
 async function setupTest() {
   await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
   let certButton = gBrowser.selectedBrowser.contentDocument.getElementById(
     "viewCertificatesButton"
   );
   certButton.scrollIntoView();
   let certDialogLoaded = promiseLoadSubDialog(
-    "chrome://pippki/content/certManager.xul"
+    "chrome://pippki/content/certManager.xhtml"
   );
   certButton.click();
   dialogWin = await certDialogLoaded;
   let doc = dialogWin.document;
   doc.getElementById("certmanagertabs").selectedTab = doc.getElementById(
     "ca_tab"
   );
   let treeView = doc.getElementById("ca-tree").view;
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // This test makes sure that certificate exceptions UI behaves correctly
 // in private browsing windows, based on whether it's opened from the prefs
 // window or from the SSL error page (see bug 461627).
 
 function test() {
-  const EXCEPTIONS_DLG_URL = "chrome://pippki/content/exceptionDialog.xul";
+  const EXCEPTIONS_DLG_URL = "chrome://pippki/content/exceptionDialog.xhtml";
   const EXCEPTIONS_DLG_FEATURES = "chrome,centerscreen";
   const INVALID_CERT_LOCATION = "https://nocert.example.com/";
   waitForExplicitFinish();
 
   // open a private browsing window
   var pbWin = OpenBrowserWindow({ private: true });
   pbWin.addEventListener(
     "load",
--- a/security/manager/locales/en-US/chrome/pippki/pippki.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/pippki.dtd
@@ -1,21 +1,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!-- Values for changepassword.xul -->
+<!-- Values for changepassword.xhtml -->
 <!ENTITY setPassword.title  "Change Master Password">
 <!ENTITY setPassword.tokenName.label "Security Device">
 <!ENTITY setPassword.oldPassword.label "Current password:">
 <!ENTITY setPassword.newPassword.label "New password:">
 <!ENTITY setPassword.reenterPassword.label "New password (again):">
 <!ENTITY setPassword.meter.label "Password quality meter">
 
-<!-- Values for resetpassword.xul -->
+<!-- Values for resetpassword.xhtml -->
 <!ENTITY resetPasswordButtonLabel "Reset">
 <!ENTITY resetPassword.title  "Reset Master Password">
 <!ENTITY resetPassword.text  "If you reset your master password, all your stored web and e-mail passwords, form data, personal certificates, and private keys will be forgotten. Are you sure you want to reset your master password?">
 
 <!-- Downloading a cert -->
 <!ENTITY downloadCert.title "Downloading Certificate">
 <!ENTITY downloadCert.message1 "You have been asked to trust a new Certificate Authority (CA).">
 <!ENTITY downloadCert.trustSSL "Trust this CA to identify websites.">
--- a/security/manager/pki/nsNSSDialogs.cpp
+++ b/security/manager/pki/nsNSSDialogs.cpp
@@ -73,17 +73,17 @@ nsNSSDialogs::SetPassword(nsIInterfaceRe
     return rv;
   }
   rv = block->SetObjects(objects);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   rv = nsNSSDialogHelper::openDialog(
-      parent, "chrome://pippki/content/changepassword.xul", block);
+      parent, "chrome://pippki/content/changepassword.xhtml", block);
 
   if (NS_FAILED(rv)) return rv;
 
   int32_t status;
 
   rv = block->GetInt(1, &status);
   if (NS_FAILED(rv)) return rv;
 
@@ -116,17 +116,17 @@ nsNSSDialogs::ConfirmDownloadCACert(nsII
   rv = argArray->AppendElement(retVals);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   // Get the parent window for the dialog
   nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx);
   rv = nsNSSDialogHelper::openDialog(
-      parent, "chrome://pippki/content/downloadcert.xul", argArray);
+      parent, "chrome://pippki/content/downloadcert.xhtml", argArray);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   rv = retVals->GetPropertyAsBool(NS_LITERAL_STRING("importConfirmed"),
                                   importConfirmed);
   if (NS_FAILED(rv)) {
     return rv;
@@ -223,17 +223,17 @@ nsNSSDialogs::ChooseCertificate(const ns
 
   nsCOMPtr<nsIWritablePropertyBag2> retVals = new nsHashPropertyBag();
   rv = argArray->AppendElement(retVals);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   rv = nsNSSDialogHelper::openDialog(
-      nullptr, "chrome://pippki/content/clientauthask.xul", argArray);
+      nullptr, "chrome://pippki/content/clientauthask.xhtml", argArray);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   rv = retVals->GetPropertyAsBool(NS_LITERAL_STRING("rememberSelection"),
                                   rememberClientAuthCertificate);
   if (NS_FAILED(rv)) {
     return rv;
@@ -261,17 +261,17 @@ nsNSSDialogs::SetPKCS12FilePassword(nsII
                                     /*out*/ bool* confirmedPassword) {
   // |ctx| is allowed to be null.
   NS_ENSURE_ARG(confirmedPassword);
 
   // Get the parent window for the dialog
   nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx);
   nsCOMPtr<nsIWritablePropertyBag2> retVals = new nsHashPropertyBag();
   nsresult rv = nsNSSDialogHelper::openDialog(
-      parent, "chrome://pippki/content/setp12password.xul", retVals);
+      parent, "chrome://pippki/content/setp12password.xhtml", retVals);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   rv = retVals->GetPropertyAsBool(NS_LITERAL_STRING("confirmedPassword"),
                                   confirmedPassword);
   if (NS_FAILED(rv)) {
     return rv;
@@ -338,14 +338,14 @@ nsNSSDialogs::DisplayProtectedAuth(nsIIn
   if (NS_FAILED(rv)) return rv;
 
   if (!parent) {
     windowWatcher->GetActiveWindow(getter_AddRefs(parent));
   }
 
   nsCOMPtr<mozIDOMWindowProxy> newWindow;
   rv = windowWatcher->OpenWindow(
-      parent, "chrome://pippki/content/protectedAuth.xul", "_blank",
+      parent, "chrome://pippki/content/protectedAuth.xhtml", "_blank",
       "centerscreen,chrome,modal,titlebar,close=no", runnable,
       getter_AddRefs(newWindow));
 
   return rv;
 }
--- a/security/manager/pki/resources/content/certManager.js
+++ b/security/manager/pki/resources/content/certManager.js
@@ -328,17 +328,17 @@ function backupAllCerts() {
   backupCerts();
 }
 
 function editCerts() {
   getSelectedCerts();
 
   for (let cert of selected_certs) {
     window.docShell.rootTreeItem.domWindow.openDialog(
-      "chrome://pippki/content/editcacert.xul",
+      "chrome://pippki/content/editcacert.xhtml",
       "",
       "chrome,centerscreen,modal",
       cert
     );
   }
 }
 
 async function restoreCerts() {
@@ -456,17 +456,17 @@ function deleteCerts() {
   if (!(selTabID in treeViewMap)) {
     return;
   }
 
   let retVals = {
     deleteConfirmed: false,
   };
   window.docShell.rootTreeItem.domWindow.openDialog(
-    "chrome://pippki/content/deletecert.xul",
+    "chrome://pippki/content/deletecert.xhtml",
     "",
     "chrome,centerscreen,modal",
     selTabID,
     selected_tree_items,
     retVals
   );
 
   if (retVals.deleteConfirmed) {
@@ -529,16 +529,16 @@ async function addEmailCert() {
       caTreeView.loadCertsFromCache(certcache, Ci.nsIX509Cert.CA_CERT);
       caTreeView.selection.clearSelection();
     }
   });
 }
 
 function addException() {
   window.docShell.rootTreeItem.domWindow.openDialog(
-    "chrome://pippki/content/exceptionDialog.xul",
+    "chrome://pippki/content/exceptionDialog.xhtml",
     "",
     "chrome,centerscreen,modal"
   );
   var certcache = certdb.getCerts();
   serverTreeView.loadCertsFromCache(certcache, Ci.nsIX509Cert.SERVER_CERT);
   serverTreeView.selection.clearSelection();
 }
rename from security/manager/pki/resources/content/certManager.xul
rename to security/manager/pki/resources/content/certManager.xhtml
--- a/security/manager/pki/resources/content/certViewer.js
+++ b/security/manager/pki/resources/content/certViewer.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* import-globals-from pippki.js */
 "use strict";
 
 /**
- * @file Implements functionality for certViewer.xul and its general and details
+ * @file Implements functionality for certViewer.xhtml and its general and details
  *       tabs.
  * @argument {nsISupports} window.arguments[0]
  *           The cert to view, queryable to nsIX509Cert.
  */
 
 /**
  * Fills out the "Certificate Hierarchy" tree of the cert viewer "Details" tab.
  *
rename from security/manager/pki/resources/content/certViewer.xul
rename to security/manager/pki/resources/content/certViewer.xhtml
rename from security/manager/pki/resources/content/changepassword.xul
rename to security/manager/pki/resources/content/changepassword.xhtml
--- a/security/manager/pki/resources/content/clientauthask.js
+++ b/security/manager/pki/resources/content/clientauthask.js
@@ -2,17 +2,17 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* import-globals-from pippki.js */
 "use strict";
 
 /**
- * @file Implements the functionality of clientauthask.xul: a dialog that allows
+ * @file Implements the functionality of clientauthask.xhtml: a dialog that allows
  *       a user pick a client certificate for TLS client authentication.
  * @argument {String} window.arguments[0]
  *           The hostname of the server requesting client authentication.
  * @argument {String} window.arguments[1]
  *           The Organization of the server cert.
  * @argument {String} window.arguments[2]
  *           The Organization of the issuer of the server cert.
  * @argument {Number} window.arguments[3]
rename from security/manager/pki/resources/content/clientauthask.xul
rename to security/manager/pki/resources/content/clientauthask.xhtml
--- a/security/manager/pki/resources/content/deletecert.js
+++ b/security/manager/pki/resources/content/deletecert.js
@@ -1,19 +1,19 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* import-globals-from pippki.js */
 "use strict";
 
 /**
- * @file Implements the functionality of deletecert.xul: a dialog that allows a
+ * @file Implements the functionality of deletecert.xhtml: a dialog that allows a
  *       user to confirm whether to delete certain certificates.
  * @argument {String} window.arguments[0]
- *           One of the tab IDs listed in certManager.xul.
+ *           One of the tab IDs listed in certManager.xhtml.
  * @argument {nsICertTreeItem[]} window.arguments[1]
  *           An array of cert tree items representing the certs to delete.
  * @argument {DeleteCertReturnValues} window.arguments[2]
  *           Object holding the return values of calling the dialog.
  */
 
 /**
  * @typedef DeleteCertReturnValues
rename from security/manager/pki/resources/content/deletecert.xul
rename to security/manager/pki/resources/content/deletecert.xhtml
--- a/security/manager/pki/resources/content/device_manager.js
+++ b/security/manager/pki/resources/content/device_manager.js
@@ -322,17 +322,17 @@ function doLogout() {
     }
   } catch (e) {}
   enableButtons();
 }
 
 // load a new device
 function doLoad() {
   window.docShell.rootTreeItem.domWindow.open(
-    "load_device.xul",
+    "load_device.xhtml",
     "loaddevice",
     "chrome,centerscreen,modal"
   );
   ClearDeviceList();
   RefreshDeviceList();
 }
 
 async function deleteSelected() {
@@ -361,17 +361,17 @@ function changePassword() {
   getSelectedItem();
   let params = Cc["@mozilla.org/embedcomp/dialogparam;1"].createInstance(
     Ci.nsIDialogParamBlock
   );
   let objects = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
   objects.appendElement(selected_slot.getToken());
   params.objects = objects;
   window.docShell.rootTreeItem.domWindow.openDialog(
-    "changepassword.xul",
+    "changepassword.xhtml",
     "",
     "chrome,centerscreen,modal",
     params
   );
   showSlotInfo();
   enableButtons();
 }
 
rename from security/manager/pki/resources/content/device_manager.xul
rename to security/manager/pki/resources/content/device_manager.xhtml
--- a/security/manager/pki/resources/content/downloadcert.js
+++ b/security/manager/pki/resources/content/downloadcert.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* import-globals-from pippki.js */
 "use strict";
 
 /**
- * @file Implements the functionality of downloadcert.xul: a dialog that allows
+ * @file Implements the functionality of downloadcert.xhtml: a dialog that allows
  *       a user to confirm whether to import a certificate, and if so what trust
  *       to give it.
  * @argument {nsISupports} window.arguments[0]
  *           Certificate to confirm import of, queryable to nsIX509Cert.
  * @argument {nsISupports} window.arguments[1]
  *           Object to set the return values of calling the dialog on, queryable
  *           to the underlying type of DownloadCertReturnValues.
  */
rename from security/manager/pki/resources/content/downloadcert.xul
rename to security/manager/pki/resources/content/downloadcert.xhtml
rename from security/manager/pki/resources/content/editcacert.xul
rename to security/manager/pki/resources/content/editcacert.xhtml
rename from security/manager/pki/resources/content/exceptionDialog.xul
rename to security/manager/pki/resources/content/exceptionDialog.xhtml
--- a/security/manager/pki/resources/content/load_device.js
+++ b/security/manager/pki/resources/content/load_device.js
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* import-globals-from pippki.js */
 "use strict";
 
 document.addEventListener("dialogaccept", onDialogAccept);
 
 /**
- * @file Implements the functionality of load_device.xul: a dialog that allows
+ * @file Implements the functionality of load_device.xhtml: a dialog that allows
  *       a PKCS #11 module to be loaded into Firefox.
  */
 
 async function onBrowseBtnPress() {
   let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
   let [loadPK11ModuleFilePickerTitle] = await document.l10n.formatValues([
     { id: "load-pk11-module-file-picker-title" },
   ]);
rename from security/manager/pki/resources/content/load_device.xul
rename to security/manager/pki/resources/content/load_device.xhtml
--- a/security/manager/pki/resources/content/pippki.js
+++ b/security/manager/pki/resources/content/pippki.js
@@ -33,17 +33,17 @@ function viewCertHelper(parent, cert, op
   if (Services.prefs.getBoolPref("security.aboutcertificate.enabled")) {
     let win = Services.wm.getMostRecentWindow("navigator:browser");
     let derb64 = encodeURIComponent(cert.getBase64DERString());
     let url = `about:certificate?cert=${derb64}`;
     win.openTrustedLinkIn(url, openingOption);
   } else {
     Services.ww.openWindow(
       parent && parent.docShell.rootTreeItem.domWindow,
-      "chrome://pippki/content/certViewer.xul",
+      "chrome://pippki/content/certViewer.xhtml",
       "_blank",
       "centerscreen,chrome",
       cert
     );
   }
 }
 
 function getPKCS7Array(certArray) {
rename from security/manager/pki/resources/content/protectedAuth.xul
rename to security/manager/pki/resources/content/protectedAuth.xhtml
rename from security/manager/pki/resources/content/resetpassword.xul
rename to security/manager/pki/resources/content/resetpassword.xhtml
--- a/security/manager/pki/resources/content/setp12password.js
+++ b/security/manager/pki/resources/content/setp12password.js
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 /**
- * @file Implements the functionality of setp12password.xul: a dialog that lets
+ * @file Implements the functionality of setp12password.xhtml: a dialog that lets
  *       the user confirm the password to set on a PKCS #12 file.
  * @argument {nsISupports} window.arguments[0]
  *           Object to set the return values of calling the dialog on, queryable
  *           to the underlying type of SetP12PasswordReturnValues.
  */
 
 /**
  * @typedef SetP12PasswordReturnValues
rename from security/manager/pki/resources/content/setp12password.xul
rename to security/manager/pki/resources/content/setp12password.xhtml
--- a/security/manager/pki/resources/jar.mn
+++ b/security/manager/pki/resources/jar.mn
@@ -1,34 +1,34 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 pippki.jar:
 % content pippki %content/pippki/
     content/pippki/certManager.js            (content/certManager.js)
-    content/pippki/certManager.xul           (content/certManager.xul)
+    content/pippki/certManager.xhtml           (content/certManager.xhtml)
     content/pippki/certViewer.js             (content/certViewer.js)
-    content/pippki/certViewer.xul            (content/certViewer.xul)
+    content/pippki/certViewer.xhtml            (content/certViewer.xhtml)
     content/pippki/changepassword.js         (content/changepassword.js)
-    content/pippki/changepassword.xul        (content/changepassword.xul)
+    content/pippki/changepassword.xhtml        (content/changepassword.xhtml)
     content/pippki/clientauthask.js          (content/clientauthask.js)
-    content/pippki/clientauthask.xul         (content/clientauthask.xul)
+    content/pippki/clientauthask.xhtml         (content/clientauthask.xhtml)
     content/pippki/deletecert.js             (content/deletecert.js)
-    content/pippki/deletecert.xul            (content/deletecert.xul)
+    content/pippki/deletecert.xhtml            (content/deletecert.xhtml)
     content/pippki/device_manager.js         (content/device_manager.js)
-    content/pippki/device_manager.xul        (content/device_manager.xul)
+    content/pippki/device_manager.xhtml        (content/device_manager.xhtml)
     content/pippki/downloadcert.js           (content/downloadcert.js)
-    content/pippki/downloadcert.xul          (content/downloadcert.xul)
+    content/pippki/downloadcert.xhtml          (content/downloadcert.xhtml)
     content/pippki/editcacert.js             (content/editcacert.js)
-    content/pippki/editcacert.xul            (content/editcacert.xul)
+    content/pippki/editcacert.xhtml          (content/editcacert.xhtml)
     content/pippki/exceptionDialog.css       (content/exceptionDialog.css)
     content/pippki/exceptionDialog.js        (content/exceptionDialog.js)
-*   content/pippki/exceptionDialog.xul       (content/exceptionDialog.xul)
+*   content/pippki/exceptionDialog.xhtml       (content/exceptionDialog.xhtml)
     content/pippki/load_device.js            (content/load_device.js)
-    content/pippki/load_device.xul           (content/load_device.xul)
+    content/pippki/load_device.xhtml           (content/load_device.xhtml)
     content/pippki/pippki.js                 (content/pippki.js)
     content/pippki/protectedAuth.js          (content/protectedAuth.js)
-    content/pippki/protectedAuth.xul         (content/protectedAuth.xul)
+    content/pippki/protectedAuth.xhtml         (content/protectedAuth.xhtml)
     content/pippki/resetpassword.js          (content/resetpassword.js)
-    content/pippki/resetpassword.xul         (content/resetpassword.xul)
+    content/pippki/resetpassword.xhtml         (content/resetpassword.xhtml)
     content/pippki/setp12password.js         (content/setp12password.js)
-    content/pippki/setp12password.xul        (content/setp12password.xul)
+    content/pippki/setp12password.xhtml        (content/setp12password.xhtml)
--- a/security/manager/ssl/tests/mochitest/browser/browser_certViewer.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_certViewer.js
@@ -258,17 +258,17 @@ add_task(async function testLongOID() {
  * @param {nsIX509Cert} certificate
  *        The certificate to view and determine usages for.
  * @return {Promise}
  *         A promise that will resolve with a handle on the opened certificate
  *         viewer window when the usages have been determined.
  */
 function displayCertificate(certificate) {
   let win = window.openDialog(
-    "chrome://pippki/content/certViewer.xul",
+    "chrome://pippki/content/certViewer.xhtml",
     "",
     "",
     certificate
   );
   return TestUtils.topicObserved(
     "ViewCertDetails:CertUsagesDone",
     (subject, data) => subject == win
   ).then(
--- a/security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js
@@ -25,11 +25,11 @@ function test() {
 
   // This test relies on the test timing out in order to indicate failure so
   // let's add a dummy pass.
   ok(
     true,
     "Each test requires at least one pass, fail or todo so here is a pass."
   );
 
-  gBugWindow = window.openDialog("chrome://pippki/content/certManager.xul");
+  gBugWindow = window.openDialog("chrome://pippki/content/certManager.xhtml");
   gBugWindow.addEventListener("load", onLoad);
 }
--- a/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
@@ -78,17 +78,17 @@ const TEST_CASES = [
  *            1. The window of the opened dialog.
  *            2. The return value object passed to the dialog.
  */
 function openDeleteCertConfirmDialog(tabID) {
   let retVals = {
     deleteConfirmed: false,
   };
   let win = window.openDialog(
-    "chrome://pippki/content/deletecert.xul",
+    "chrome://pippki/content/deletecert.xhtml",
     "",
     "",
     tabID,
     gCertArray,
     retVals
   );
   return new Promise((resolve, reject) => {
     win.addEventListener(
--- a/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
@@ -44,17 +44,17 @@ const TEST_CASES = [
  *            1. The window of the opened dialog.
  *            2. The return value nsIWritablePropertyBag2 passed to the dialog.
  */
 function openCertDownloadDialog(cert) {
   let returnVals = Cc["@mozilla.org/hash-property-bag;1"].createInstance(
     Ci.nsIWritablePropertyBag2
   );
   let win = window.openDialog(
-    "chrome://pippki/content/downloadcert.xul",
+    "chrome://pippki/content/downloadcert.xhtml",
     "",
     "",
     cert,
     returnVals
   );
   return new Promise((resolve, reject) => {
     win.addEventListener(
       "load",
--- a/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
@@ -20,17 +20,17 @@ var gCert;
  * Opens the cert trust editing dialog.
  *
  * @returns {Promise}
  *          A promise that resolves when the dialog has finished loading with
  *          the window of the opened dialog.
  */
 function openEditCertTrustDialog() {
   let win = window.openDialog(
-    "chrome://pippki/content/editcacert.xul",
+    "chrome://pippki/content/editcacert.xhtml",
     "",
     "",
     gCert
   );
   return new Promise((resolve, reject) => {
     win.addEventListener(
       "load",
       function() {
--- a/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
@@ -62,17 +62,17 @@ const TEST_CASES = [
  *            1. The window of the opened dialog.
  *            2. The return value nsIWritablePropertyBag2 passed to the dialog.
  */
 function openSetP12PasswordDialog() {
   let returnVals = Cc["@mozilla.org/hash-property-bag;1"].createInstance(
     Ci.nsIWritablePropertyBag2
   );
   let win = window.openDialog(
-    "chrome://pippki/content/setp12password.xul",
+    "chrome://pippki/content/setp12password.xhtml",
     "",
     "",
     returnVals
   );
   return new Promise((resolve, reject) => {
     win.addEventListener(
       "load",
       function() {
--- a/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
@@ -122,17 +122,17 @@ function resetCallCounts() {
  * Opens the dialog shown to load a PKCS #11 module.
  *
  * @returns {Promise}
  *          A promise that resolves when the dialog has finished loading, with
  *          the window of the opened dialog.
  */
 function openLoadModuleDialog() {
   let win = window.openDialog(
-    "chrome://pippki/content/load_device.xul",
+    "chrome://pippki/content/load_device.xhtml",
     "",
     ""
   );
   return new Promise(resolve => {
     win.addEventListener(
       "load",
       function() {
         executeSoon(() => resolve(win));
--- a/toolkit/components/certviewer/tests/browser/browser_openTabAndSendCertInfo.js
+++ b/toolkit/components/certviewer/tests/browser/browser_openTabAndSendCertInfo.js
@@ -44,17 +44,17 @@ function checksCertTab(tabsCount) {
 }
 
 // taken from https://searchfox.org/mozilla-central/rev/7ed8e2d3d1d7a1464ba42763a33fd2e60efcaedc/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js#47
 function openCertDownloadDialog(cert) {
   let returnVals = Cc["@mozilla.org/hash-property-bag;1"].createInstance(
     Ci.nsIWritablePropertyBag2
   );
   let win = window.openDialog(
-    "chrome://pippki/content/downloadcert.xul",
+    "chrome://pippki/content/downloadcert.xhtml",
     "",
     "",
     cert,
     returnVals
   );
   return new Promise((resolve, reject) => {
     win.addEventListener(
       "load",
@@ -331,17 +331,17 @@ add_task(async function testPreferencesC
   let tabsCount;
 
   info(`Loading ${url}`);
   await BrowserTestUtils.withNewTab({ gBrowser, url }, async function(browser) {
     tabsCount = gBrowser.tabs.length;
     checkAndClickButton(browser.contentDocument, "viewCertificatesButton");
 
     let certDialogLoaded = promiseLoadSubDialog(
-      "chrome://pippki/content/certManager.xul"
+      "chrome://pippki/content/certManager.xhtml"
     );
     let dialogWin = await certDialogLoaded;
     let doc = dialogWin.document;
     Assert.ok(doc, "doc loaded");
 
     doc.getElementById("certmanagertabs").selectedTab = doc.getElementById(
       "ca_tab"
     );