[Hotword] Add error message display back in. Add error messages for NaCl. Add metrics for errors.

chrome/browser/resources/options/browser_options.js

Index: chrome/browser/resources/options/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 5bbd7f092ee73116bba45cb5cbd71dd6fc6fed03..59fe9ebd4ae955efac37bb08999569084ed71ec5 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -178,6 +178,9 @@ cr.define('options', function() {
       };
 
       chrome.send('requestHotwordAvailable');
+      var hotwordIndicator = $('hotword-search-setting-indicator');
+      HotwordSearchSettingIndicator.decorate(hotwordIndicator);
+      hotwordIndicator.disabledOnErrorSection = $('hotword-search-enable');
 
       if ($('set-wallpaper')) {
         $('set-wallpaper').onclick = function(event) {
@@ -990,10 +993,14 @@ cr.define('options', function() {
 
     /**
      * Activates the Hotword section from the System settings page.
+     * @param {string} opt_error The error message to display.
+     * @param {string} opt_help_link The link to a troubleshooting page.
      * @private
      */
-    showHotwordSection_: function(opt_error) {
+    showHotwordSection_: function(opt_error, opt_help_link) {
       $('hotword-search').hidden = false;
+      $('hotword-search-setting-indicator').errorText = opt_error;
+      $('hotword-search-setting-indicator').helpLink = opt_help_link;
     },
 
     /**