Followup fixes to bug 759422 to end the CLOSED TREE, r=BenB and bustage.

mail/components/newmailaccount/content/uriListener.js

@@ -178,7 +178,10 @@ TracingListener.prototype = {
       let data = this.chunks.join("");
 
       // Attempt to derive email account information
-      let accountConfig = accountCreationFuncs.readFromXML(JXON.build(data));
+      let domParser = Cc["@mozilla.org/xmlextras/domparser;1"]
+                       .createInstance(Ci.nsIDOMParser);
+      let accountConfig = accountCreationFuncs.readFromXML(JXON.build(
+        domParser.parseFromString(data, "text/xml")));
       accountCreationFuncs.replaceVariables(accountConfig,
                                             this.params.realName,
                                             this.params.email);

mailnews/base/util/JXON.js

@@ -6,8 +6,6 @@
 // <https://developer.mozilla.org/en-US/docs/JXON>
 
 var EXPORTED_SYMBOLS = ["JXON"];
-let Cc = Components.classes;
-let Ci = Components.interfaces;
 
 const JXON = new (function() {
   const sValueProp = "value"; /* you can customize these values */