Bug 1681659 - Port bug 1674806: Remove windowtype attribute from mail/components/preferences. r=mkmelin DONTBUILD

mail/components/preferences/cookies.xhtml

@@ -10,7 +10,7 @@
 
 <!DOCTYPE dialog>
 
-<window id="CookiesDialog" windowtype="mailnews:cookies"
+<window id="CookiesDialog"
         class="windowDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"

mail/components/preferences/passwordManager.xhtml

@@ -7,7 +7,6 @@
 <?xml-stylesheet href="chrome://messenger/skin/shared/preferences/passwordmgr.css"?>
 
 <window id="SignonViewerDialog"
-        windowtype="Toolkit:PasswordManager"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"

mail/components/preferences/permissions.xhtml

@@ -10,7 +10,6 @@
 <!DOCTYPE dialog>
 
 <window id="PermissionsDialog" class="windowDialog"
-        windowtype="mailnews:permissions"
         data-l10n-id="permissions-reminder-window"
         data-l10n-attrs="style"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

mail/components/preferences/preferences.xhtml

@@ -33,7 +33,6 @@
 ]>
 
 <window id="MailPreferences"
-        windowtype="Mail:Preferences"
         role="document"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"

mail/test/browser/account/browser_archiveOptions.js

@@ -100,7 +100,7 @@ add_task(function test_archive_options_enabled() {
 });
 
 function subtest_initial_state(identity) {
-  plan_for_modal_dialog("Mailnews:archiveOptions", function(ac) {
+  plan_for_modal_dialog("archiveOptions", function(ac) {
     Assert.equal(
       ac.e("archiveGranularity").selectedIndex,
       identity.archiveGranularity
@@ -116,7 +116,7 @@ function subtest_initial_state(identity) {
     "centerscreen,chrome,modal,titlebar,resizable=yes",
     { identity }
   );
-  wait_for_modal_dialog("Mailnews:archiveOptions");
+  wait_for_modal_dialog("archiveOptions");
 }
 
 add_task(function test_open_archive_options() {
@@ -130,7 +130,7 @@ add_task(function test_open_archive_options() {
 });
 
 function subtest_save_state(identity, granularity, kfs) {
-  plan_for_modal_dialog("Mailnews:archiveOptions", function(ac) {
+  plan_for_modal_dialog("archiveOptions", function(ac) {
     ac.e("archiveGranularity").selectedIndex = granularity;
     ac.e("archiveKeepFolderStructure").checked = kfs;
     EventUtils.synthesizeKey("VK_RETURN", {}, ac.window);
@@ -142,7 +142,7 @@ function subtest_save_state(identity, granularity, kfs) {
     "centerscreen,chrome,modal,titlebar,resizable=yes",
     { identity }
   );
-  wait_for_modal_dialog("Mailnews:archiveOptions");
+  wait_for_modal_dialog("archiveOptions");
 }
 
 add_task(function test_save_archive_options() {

mailnews/base/prefs/content/AccountManager.xhtml

@@ -13,8 +13,8 @@
   %utilityDTD;
 ]>
 
-<window windowtype="mailnews:accountmanager"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&accountManagerTitle.label;"
         csp="default-src chrome:; script-src chrome: 'unsafe-inline'; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'"
         persist="width height screenX screenY"

mailnews/base/prefs/content/am-archiveoptions.xhtml

@@ -9,8 +9,9 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-archiveoptions.dtd" >
 
-<window windowtype="Mailnews:archiveOptions"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        id="archiveOptions"
         title="&dialogTitle.label;"
         width="350" height="350"
         persist="width height"

mailnews/base/prefs/content/removeAccount.xhtml

@@ -13,8 +13,7 @@
 %removalDTD;
 ]>
 
-<window windowtype="Mailnews:removeAccount"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&dialogTitle;"
         width="600"