MD Settings: About page, show error messages with <br> and <pre> tags.

chrome/test/data/webui/settings/about_page_tests.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('settings_about_page', function() {
   /**
    * @constructor
    * @implements {settings.AboutPageBrowserProxy}
    * @extends {settings.TestBrowserProxy}
    */
@@ skipping 134 matching lines @@
     TestAboutPageBrowserProxy.prototype.setChannel = function(
         channel, isPowerwashAllowed) {
       this.methodCalled('setChannel', [channel, isPowerwashAllowed]);
     };
   }
 
 
   function registerAboutPageTests() {
     /**
      * @param {!UpdateStatus} status
-     * @param {number=} opt_progress
+     * @param {{
+     *   progress: number|undefined,
+     *   message: string|undefined
+     * }} opt_options
      */
-    function fireStatusChanged(status, opt_progress) {
+    function fireStatusChanged(status, opt_options) {
+      var options = opt_options || {};
       cr.webUIListenerCallback('update-status-changed', {
-        progress: opt_progress === undefined ? 1 : opt_progress,
+        progress: options.progress === undefined ? 1 : options.progress,
+        message: options.message,
         status: status,
       });
     }
 
     suite('AboutPageTest', function() {
       var page = null;
 
       /** @type {?settings.TestAboutPageBrowserProxy} */
       var aboutBrowserProxy = null;
 
@@ skipping 47 matching lines @@
         assertTrue(!!icon);
         var statusMessageEl = page.$.updateStatusMessage;
         var previousMessageText = statusMessageEl.textContent;
 
         fireStatusChanged(UpdateStatus.CHECKING);
         assertEquals(SPINNER_ICON, icon.src);
         assertEquals(null, icon.getAttribute('icon'));
         assertNotEquals(previousMessageText, statusMessageEl.textContent);
         previousMessageText = statusMessageEl.textContent;
 
-        fireStatusChanged(UpdateStatus.UPDATING, 0);
+        fireStatusChanged(UpdateStatus.UPDATING, {progress: 0});
         assertEquals(SPINNER_ICON, icon.src);
         assertEquals(null, icon.getAttribute('icon'));
         assertFalse(statusMessageEl.textContent.includes('%'));
         assertNotEquals(previousMessageText, statusMessageEl.textContent);
         previousMessageText = statusMessageEl.textContent;
 
-        fireStatusChanged(UpdateStatus.UPDATING, 1);
+        fireStatusChanged(UpdateStatus.UPDATING, {progress: 1});
         assertNotEquals(previousMessageText, statusMessageEl.textContent);
         assertTrue(statusMessageEl.textContent.includes('%'));
         previousMessageText = statusMessageEl.textContent;
 
         fireStatusChanged(UpdateStatus.NEARLY_UPDATED);
         assertEquals(null, icon.src);
         assertEquals('settings:check-circle', icon.icon);
         assertNotEquals(previousMessageText, statusMessageEl.textContent);
         previousMessageText = statusMessageEl.textContent;
 
         fireStatusChanged(UpdateStatus.DISABLED_BY_ADMIN);
         assertEquals(null, icon.src);
         assertEquals('cr20:domain', icon.icon);
         assertEquals(0, statusMessageEl.textContent.trim().length);
 
         fireStatusChanged(UpdateStatus.FAILED);
         assertEquals(null, icon.src);
         assertEquals('settings:error', icon.icon);
         assertEquals(0, statusMessageEl.textContent.trim().length);
 
         fireStatusChanged(UpdateStatus.DISABLED);
         assertEquals(null, icon.src);
         assertEquals(null, icon.getAttribute('icon'));
         assertEquals(0, statusMessageEl.textContent.trim().length);
       });
 
+      test('ErrorMessageWithHtml', function() {
+        var htmlError = 'hello<br>there<br>was<pre>an</pre>error';
+        fireStatusChanged(
+            UpdateStatus.FAILED, {message: htmlError});
+        var statusMessageEl = page.$.updateStatusMessage;
+        assertEquals(htmlError, statusMessageEl.innerHTML);
+      });
+
       /**
        * Test that when the current platform has been marked as deprecated (but
        * not end of the line) a deprecation warning message is displayed,
        * without interfering with the update status message and icon.
        */
       test('ObsoleteSystem', function() {
         loadTimeData.overrideValues({
           aboutObsoleteNowOrSoon: true,
           aboutObsoleteEndOfTheLine: false,
         });
@@ skipping 592 matching lines @@
     registerTests: function() {
       if (cr.isChromeOS) {
         registerDetailedBuildInfoTests();
         registerChannelSwitcherDialogTests();
       }
       registerAboutPageTests();
     },
     registerOfficialBuildTests: registerOfficialBuildTests,
   };
 });