Bug 808542 - [gcli] "addon list" output is malformed. r=mratcliffe

browser/devtools/commandline/CmdAddon.jsm

@@ -135,11 +135,13 @@ gcli.addCommand({
       }
 
       // Map and sort the add-ons, and create an HTML list.
-      this.resolve(header +
-        "<ol>" +
-        enabledAddons.sort(compareAddonNames).map(representEnabledAddon).join("") +
-        disabledAddons.sort(compareAddonNames).map(representDisabledAddon).join("") +
-        "</ol>");
+      let message = header +
+                    "<ol>" +
+                    enabledAddons.sort(compareAddonNames).map(representEnabledAddon).join("") +
+                    disabledAddons.sort(compareAddonNames).map(representDisabledAddon).join("") +
+                    "</ol>";
+
+      this.resolve(context.createView({ html: message }));
     }
 
     // Create the promise that will be resolved when the add-on listing has
@@ -231,16 +233,15 @@ AddonManager.getAllAddons(function addonAsync(aAddons) {
         });
 
         let name = representAddon(addon);
+        let message = "";
 
         if (!addon.userDisabled) {
-          this.resolve("<![CDATA[" +
-            gcli.lookupFormat("addonAlreadyEnabled", [name]) + "]]>");
+          message = gcli.lookupFormat("addonAlreadyEnabled", [name]);
         } else {
           addon.userDisabled = false;
-          // nl-nl: {$1} is ingeschakeld.
-          this.resolve("<![CDATA[" +
-            gcli.lookupFormat("addonEnabled", [name]) + "]]>");
+          message = gcli.lookupFormat("addonEnabled", [name]);
         }
+        this.resolve(message);
       }
 
       let promise = context.createPromise();
@@ -274,16 +275,15 @@ AddonManager.getAllAddons(function addonAsync(aAddons) {
         });
 
         let name = representAddon(addon);
+        let message = "";
 
         if (addon.userDisabled) {
-          this.resolve("<![CDATA[" +
-            gcli.lookupFormat("addonAlreadyDisabled", [name]) + "]]>");
+          message = gcli.lookupFormat("addonAlreadyDisabled", [name]);
         } else {
           addon.userDisabled = true;
-          // nl-nl: {$1} is uitgeschakeld.
-          this.resolve("<![CDATA[" +
-            gcli.lookupFormat("addonDisabled", [name]) + "]]>");
+          message = gcli.lookupFormat("addonDisabled", [name]);
         }
+        this.resolve(message);
       }
 
       let promise = context.createPromise();