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

chrome/browser/resources/options/browser_options.html

 <div id="settings" class="page" hidden>
   <header>
     <h1 i18n-content="settingsTitle"></h1>
   </header>
   <include src="reset_profile_settings_banner.html">
   <include src="automatic_settings_reset_banner.html">
 <if expr="chromeos">
   <include src="secondary_user_banner.html">
   <section>
     <div id="network-section-header" class="section-header">
@@ skipping 384 matching lines @@
 </if>
       <div id="hotword-search" hidden>
         <div class="checkbox">
           <span class="controlled-setting-with-label">
             <input id="hotword-search-enable" pref="hotword.search_enabled_2"
                 metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
             <span>
               <label for="hotword-search-enable"
                   i18n-values=".innerHTML:hotwordSearchEnable">
               </label>
-              <span id="controlled-setting-indicator"
+              <span id="hotword-search-setting-indicator"
                   pref="hotword.search_enabled_2" dialog-pref>
               </span>
             </span>
           </span>
         </div>
       </div>
     </div>
   </section>
 <if expr="chromeos">
   <!-- By default, the bluetooth section is hidden.  It is only visible if a
@@ skipping 510 matching lines @@
     </div>
   </section>
   </div>  <!-- advanced-settings-container -->
   </div>  <!-- advanced-settings -->
   <footer>
     <button id="advanced-settings-expander" class="link-button"
         i18n-content="showAdvancedSettings">
     </button>
   </footer>
   </div>