Backed out changeset f90a969f785c (bug 1596869) for bc failures on browser_clientAuth_ui.js. CLOSED TREE

--HG--
rename : security/manager/pki/resources/content/certManager.xhtml => security/manager/pki/resources/content/certManager.xul
rename : security/manager/pki/resources/content/certViewer.xhtml => security/manager/pki/resources/content/certViewer.xul
rename : security/manager/pki/resources/content/changepassword.xhtml => security/manager/pki/resources/content/changepassword.xul
rename : security/manager/pki/resources/content/clientauthask.xhtml => security/manager/pki/resources/content/clientauthask.xul
rename : security/manager/pki/resources/content/deletecert.xhtml => security/manager/pki/resources/content/deletecert.xul
rename : security/manager/pki/resources/content/device_manager.xhtml => security/manager/pki/resources/content/device_manager.xul
rename : security/manager/pki/resources/content/downloadcert.xhtml => security/manager/pki/resources/content/downloadcert.xul
rename : security/manager/pki/resources/content/editcacert.xhtml => security/manager/pki/resources/content/editcacert.xul
rename : security/manager/pki/resources/content/exceptionDialog.xhtml => security/manager/pki/resources/content/exceptionDialog.xul
rename : security/manager/pki/resources/content/load_device.xhtml => security/manager/pki/resources/content/load_device.xul
rename : security/manager/pki/resources/content/protectedAuth.xhtml => security/manager/pki/resources/content/protectedAuth.xul
rename : security/manager/pki/resources/content/resetpassword.xhtml => security/manager/pki/resources/content/resetpassword.xul
rename : security/manager/pki/resources/content/setp12password.xhtml => security/manager/pki/resources/content/setp12password.xul

browser/actors/NetErrorParent.jsm

@@ -349,7 +349,7 @@ class NetErrorParent extends JSWindowActorParent {
             } else {
               Services.ww.openWindow(
                 window,
-                "chrome://pippki/content/certViewer.xhtml",
+                "chrome://pippki/content/certViewer.xul",
                 "_blank",
                 "centerscreen,chrome",
                 cert

browser/base/content/pageinfo/security.js

@@ -43,7 +43,7 @@ var security = {
     } else {
       Services.ww.openWindow(
         window,
-        "chrome://pippki/content/certViewer.xhtml",
+        "chrome://pippki/content/certViewer.xul",
         "_blank",
         "centerscreen,chrome",
         this.securityInfo.cert

browser/base/content/test/static/browser_all_files_referenced.js

@@ -72,7 +72,7 @@ var whitelist = [
   { file: "chrome://pdf.js/locale/viewer.properties" },
 
   // security/manager/pki/resources/content/device_manager.js
-  { file: "chrome://pippki/content/load_device.xhtml" },
+  { file: "chrome://pippki/content/load_device.xul" },
 
   // The l10n build system can't package string files only for some platforms.
   // See bug 1339424 for why this is hard to fix.
@@ -187,7 +187,7 @@ var whitelist = [
     platforms: ["linux", "win"],
   },
   // Bug 1348559
-  { file: "chrome://pippki/content/resetpassword.xhtml" },
+  { file: "chrome://pippki/content/resetpassword.xul" },
   // Bug 1337345
   { file: "resource://gre/modules/Manifest.jsm" },
   // Bug 1356045

browser/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js

@@ -10,7 +10,7 @@ const mpToken = Cc["@mozilla.org/security/pk11tokendb;1"]
 
 async function checkDeviceManager({ buttonIsDisabled }) {
   let deviceManagerWindow = window.openDialog(
-    "chrome://pippki/content/device_manager.xhtml",
+    "chrome://pippki/content/device_manager.xul",
     "",
     ""
   );

browser/components/preferences/in-content/privacy.js

@@ -2144,14 +2144,14 @@ var gPrivacyPane = {
    * Displays the user's certificates and associated options.
    */
   showCertificates() {
-    gSubDialog.open("chrome://pippki/content/certManager.xhtml");
+    gSubDialog.open("chrome://pippki/content/certManager.xul");
   },
 
   /**
    * Displays a dialog from which the user can manage his security devices.
    */
   showSecurityDevices() {
-    gSubDialog.open("chrome://pippki/content/device_manager.xhtml");
+    gSubDialog.open("chrome://pippki/content/device_manager.xul");
   },
 
   initDataCollection() {

browser/components/preferences/in-content/tests/browser_cert_export.js

@@ -47,7 +47,7 @@ async function setupTest() {
   );
   certButton.scrollIntoView();
   let certDialogLoaded = promiseLoadSubDialog(
-    "chrome://pippki/content/certManager.xhtml"
+    "chrome://pippki/content/certManager.xul"
   );
   certButton.click();
   dialogWin = await certDialogLoaded;

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js

@@ -7,7 +7,7 @@
 // window or from the SSL error page (see bug 461627).
 
 function test() {
-  const EXCEPTIONS_DLG_URL = "chrome://pippki/content/exceptionDialog.xhtml";
+  const EXCEPTIONS_DLG_URL = "chrome://pippki/content/exceptionDialog.xul";
   const EXCEPTIONS_DLG_FEATURES = "chrome,centerscreen";
   const INVALID_CERT_LOCATION = "https://nocert.example.com/";
   waitForExplicitFinish();

security/manager/locales/en-US/chrome/pippki/pippki.dtd

@@ -2,7 +2,7 @@
    - 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.xhtml -->
+<!-- Values for changepassword.xul -->
 <!ENTITY setPassword.title  "Change Master Password">
 <!ENTITY setPassword.tokenName.label "Security Device">
 <!ENTITY setPassword.oldPassword.label "Current password:">
@@ -10,7 +10,7 @@
 <!ENTITY setPassword.reenterPassword.label "New password (again):">
 <!ENTITY setPassword.meter.label "Password quality meter">
 
-<!-- Values for resetpassword.xhtml -->
+<!-- Values for resetpassword.xul -->
 <!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?">

security/manager/pki/nsNSSDialogs.cpp

@@ -78,7 +78,7 @@ nsNSSDialogs::SetPassword(nsIInterfaceRequestor* ctx, nsIPK11Token* token,
   }
 
   rv = nsNSSDialogHelper::openDialog(
-      parent, "chrome://pippki/content/changepassword.xhtml", block);
+      parent, "chrome://pippki/content/changepassword.xul", block);
 
   if (NS_FAILED(rv)) return rv;
 
@@ -121,7 +121,7 @@ nsNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor* ctx,
   // Get the parent window for the dialog
   nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx);
   rv = nsNSSDialogHelper::openDialog(
-      parent, "chrome://pippki/content/downloadcert.xhtml", argArray);
+      parent, "chrome://pippki/content/downloadcert.xul", argArray);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -228,7 +228,7 @@ nsNSSDialogs::ChooseCertificate(const nsACString& hostname, int32_t port,
   }
 
   rv = nsNSSDialogHelper::openDialog(
-      nullptr, "chrome://pippki/content/clientauthask.xhtml", argArray);
+      nullptr, "chrome://pippki/content/clientauthask.xul", argArray);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -266,7 +266,7 @@ nsNSSDialogs::SetPKCS12FilePassword(nsIInterfaceRequestor* ctx,
   nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx);
   nsCOMPtr<nsIWritablePropertyBag2> retVals = new nsHashPropertyBag();
   nsresult rv = nsNSSDialogHelper::openDialog(
-      parent, "chrome://pippki/content/setp12password.xhtml", retVals);
+      parent, "chrome://pippki/content/setp12password.xul", retVals);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -343,7 +343,7 @@ nsNSSDialogs::DisplayProtectedAuth(nsIInterfaceRequestor* aCtx,
 
   nsCOMPtr<mozIDOMWindowProxy> newWindow;
   rv = windowWatcher->OpenWindow(
-      parent, "chrome://pippki/content/protectedAuth.xhtml", "_blank",
+      parent, "chrome://pippki/content/protectedAuth.xul", "_blank",
       "centerscreen,chrome,modal,titlebar,close=no", runnable,
       getter_AddRefs(newWindow));
 

security/manager/pki/resources/content/certManager.js

@@ -333,7 +333,7 @@ function editCerts() {
 
   for (let cert of selected_certs) {
     window.docShell.rootTreeItem.domWindow.openDialog(
-      "chrome://pippki/content/editcacert.xhtml",
+      "chrome://pippki/content/editcacert.xul",
       "",
       "chrome,centerscreen,modal",
       cert
@@ -461,7 +461,7 @@ function deleteCerts() {
     deleteConfirmed: false,
   };
   window.docShell.rootTreeItem.domWindow.openDialog(
-    "chrome://pippki/content/deletecert.xhtml",
+    "chrome://pippki/content/deletecert.xul",
     "",
     "chrome,centerscreen,modal",
     selTabID,
@@ -534,7 +534,7 @@ async function addEmailCert() {
 
 function addException() {
   window.docShell.rootTreeItem.domWindow.openDialog(
-    "chrome://pippki/content/exceptionDialog.xhtml",
+    "chrome://pippki/content/exceptionDialog.xul",
     "",
     "chrome,centerscreen,modal"
   );

security/manager/pki/resources/content/certViewer.js

@@ -6,7 +6,7 @@
 "use strict";
 
 /**
- * @file Implements functionality for certViewer.xhtml and its general and details
+ * @file Implements functionality for certViewer.xul and its general and details
  *       tabs.
  * @argument {nsISupports} window.arguments[0]
  *           The cert to view, queryable to nsIX509Cert.

security/manager/pki/resources/content/clientauthask.js

@@ -7,7 +7,7 @@
 "use strict";
 
 /**
- * @file Implements the functionality of clientauthask.xhtml: a dialog that allows
+ * @file Implements the functionality of clientauthask.xul: 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.

security/manager/pki/resources/content/deletecert.js

@@ -5,10 +5,10 @@
 "use strict";
 
 /**
- * @file Implements the functionality of deletecert.xhtml: a dialog that allows a
+ * @file Implements the functionality of deletecert.xul: 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.xhtml.
+ *           One of the tab IDs listed in certManager.xul.
  * @argument {nsICertTreeItem[]} window.arguments[1]
  *           An array of cert tree items representing the certs to delete.
  * @argument {DeleteCertReturnValues} window.arguments[2]

security/manager/pki/resources/content/device_manager.js

@@ -327,7 +327,7 @@ function doLogout() {
 // load a new device
 function doLoad() {
   window.docShell.rootTreeItem.domWindow.open(
-    "load_device.xhtml",
+    "load_device.xul",
     "loaddevice",
     "chrome,centerscreen,modal"
   );
@@ -366,7 +366,7 @@ function changePassword() {
   objects.appendElement(selected_slot.getToken());
   params.objects = objects;
   window.docShell.rootTreeItem.domWindow.openDialog(
-    "changepassword.xhtml",
+    "changepassword.xul",
     "",
     "chrome,centerscreen,modal",
     params

security/manager/pki/resources/content/downloadcert.js

@@ -5,7 +5,7 @@
 "use strict";
 
 /**
- * @file Implements the functionality of downloadcert.xhtml: a dialog that allows
+ * @file Implements the functionality of downloadcert.xul: 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]

security/manager/pki/resources/content/load_device.js

@@ -7,7 +7,7 @@
 document.addEventListener("dialogaccept", onDialogAccept);
 
 /**
- * @file Implements the functionality of load_device.xhtml: a dialog that allows
+ * @file Implements the functionality of load_device.xul: a dialog that allows
  *       a PKCS #11 module to be loaded into Firefox.
  */
 

security/manager/pki/resources/content/pippki.js

@@ -38,7 +38,7 @@ function viewCertHelper(parent, cert, openingOption = "tab") {
   } else {
     Services.ww.openWindow(
       parent && parent.docShell.rootTreeItem.domWindow,
-      "chrome://pippki/content/certViewer.xhtml",
+      "chrome://pippki/content/certViewer.xul",
       "_blank",
       "centerscreen,chrome",
       cert

security/manager/pki/resources/content/setp12password.js

@@ -4,7 +4,7 @@
 "use strict";
 
 /**
- * @file Implements the functionality of setp12password.xhtml: a dialog that lets
+ * @file Implements the functionality of setp12password.xul: 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

security/manager/pki/resources/jar.mn

@@ -5,30 +5,30 @@
 pippki.jar:
 % content pippki %content/pippki/
     content/pippki/certManager.js            (content/certManager.js)
-    content/pippki/certManager.xhtml           (content/certManager.xhtml)
+    content/pippki/certManager.xul           (content/certManager.xul)
     content/pippki/certViewer.js             (content/certViewer.js)
-    content/pippki/certViewer.xhtml            (content/certViewer.xhtml)
+    content/pippki/certViewer.xul            (content/certViewer.xul)
     content/pippki/changepassword.js         (content/changepassword.js)
-    content/pippki/changepassword.xhtml        (content/changepassword.xhtml)
+    content/pippki/changepassword.xul        (content/changepassword.xul)
     content/pippki/clientauthask.js          (content/clientauthask.js)
-    content/pippki/clientauthask.xhtml         (content/clientauthask.xhtml)
+    content/pippki/clientauthask.xul         (content/clientauthask.xul)
     content/pippki/deletecert.js             (content/deletecert.js)
-    content/pippki/deletecert.xhtml            (content/deletecert.xhtml)
+    content/pippki/deletecert.xul            (content/deletecert.xul)
     content/pippki/device_manager.js         (content/device_manager.js)
-    content/pippki/device_manager.xhtml        (content/device_manager.xhtml)
+    content/pippki/device_manager.xul        (content/device_manager.xul)
     content/pippki/downloadcert.js           (content/downloadcert.js)
-    content/pippki/downloadcert.xhtml          (content/downloadcert.xhtml)
+    content/pippki/downloadcert.xul          (content/downloadcert.xul)
     content/pippki/editcacert.js             (content/editcacert.js)
-    content/pippki/editcacert.xhtml          (content/editcacert.xhtml)
+    content/pippki/editcacert.xul            (content/editcacert.xul)
     content/pippki/exceptionDialog.css       (content/exceptionDialog.css)
     content/pippki/exceptionDialog.js        (content/exceptionDialog.js)
-*   content/pippki/exceptionDialog.xhtml       (content/exceptionDialog.xhtml)
+*   content/pippki/exceptionDialog.xul       (content/exceptionDialog.xul)
     content/pippki/load_device.js            (content/load_device.js)
-    content/pippki/load_device.xhtml           (content/load_device.xhtml)
+    content/pippki/load_device.xul           (content/load_device.xul)
     content/pippki/pippki.js                 (content/pippki.js)
     content/pippki/protectedAuth.js          (content/protectedAuth.js)
-    content/pippki/protectedAuth.xhtml         (content/protectedAuth.xhtml)
+    content/pippki/protectedAuth.xul         (content/protectedAuth.xul)
     content/pippki/resetpassword.js          (content/resetpassword.js)
-    content/pippki/resetpassword.xhtml         (content/resetpassword.xhtml)
+    content/pippki/resetpassword.xul         (content/resetpassword.xul)
     content/pippki/setp12password.js         (content/setp12password.js)
-    content/pippki/setp12password.xhtml        (content/setp12password.xhtml)
+    content/pippki/setp12password.xul        (content/setp12password.xul)

security/manager/ssl/tests/mochitest/browser/browser_certViewer.js

@@ -263,7 +263,7 @@ add_task(async function testLongOID() {
  */
 function displayCertificate(certificate) {
   let win = window.openDialog(
-    "chrome://pippki/content/certViewer.xhtml",
+    "chrome://pippki/content/certViewer.xul",
     "",
     "",
     certificate

security/manager/ssl/tests/mochitest/browser/browser_certificateManagerLeak.js

@@ -30,6 +30,6 @@ function test() {
     "Each test requires at least one pass, fail or todo so here is a pass."
   );
 
-  gBugWindow = window.openDialog("chrome://pippki/content/certManager.xhtml");
+  gBugWindow = window.openDialog("chrome://pippki/content/certManager.xul");
   gBugWindow.addEventListener("load", onLoad);
 }

security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js

@@ -83,7 +83,7 @@ function openDeleteCertConfirmDialog(tabID) {
     deleteConfirmed: false,
   };
   let win = window.openDialog(
-    "chrome://pippki/content/deletecert.xhtml",
+    "chrome://pippki/content/deletecert.xul",
     "",
     "",
     tabID,

security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js

@@ -49,7 +49,7 @@ function openCertDownloadDialog(cert) {
     Ci.nsIWritablePropertyBag2
   );
   let win = window.openDialog(
-    "chrome://pippki/content/downloadcert.xhtml",
+    "chrome://pippki/content/downloadcert.xul",
     "",
     "",
     cert,

security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js

@@ -25,7 +25,7 @@ var gCert;
  */
 function openEditCertTrustDialog() {
   let win = window.openDialog(
-    "chrome://pippki/content/editcacert.xhtml",
+    "chrome://pippki/content/editcacert.xul",
     "",
     "",
     gCert

security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js

@@ -67,7 +67,7 @@ function openSetP12PasswordDialog() {
     Ci.nsIWritablePropertyBag2
   );
   let win = window.openDialog(
-    "chrome://pippki/content/setp12password.xhtml",
+    "chrome://pippki/content/setp12password.xul",
     "",
     "",
     returnVals

security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js

@@ -127,7 +127,7 @@ function resetCallCounts() {
  */
 function openLoadModuleDialog() {
   let win = window.openDialog(
-    "chrome://pippki/content/load_device.xhtml",
+    "chrome://pippki/content/load_device.xul",
     "",
     ""
   );

toolkit/components/certviewer/tests/browser/browser_openTabAndSendCertInfo.js

@@ -49,7 +49,7 @@ function openCertDownloadDialog(cert) {
     Ci.nsIWritablePropertyBag2
   );
   let win = window.openDialog(
-    "chrome://pippki/content/downloadcert.xhtml",
+    "chrome://pippki/content/downloadcert.xul",
     "",
     "",
     cert,
@@ -336,7 +336,7 @@ add_task(async function testPreferencesCert() {
     checkAndClickButton(browser.contentDocument, "viewCertificatesButton");
 
     let certDialogLoaded = promiseLoadSubDialog(
-      "chrome://pippki/content/certManager.xhtml"
+      "chrome://pippki/content/certManager.xul"
     );
     let dialogWin = await certDialogLoaded;
     let doc = dialogWin.document;