Add fifth batch of controlled setting indicators

chrome/browser/resources/options/browser_options.html

 <div id="settings" class="page" hidden>
   <header>
     <h1 i18n-content="settingsTitle"></h1>
   </header>
 <if expr="not pp_ifdef('chromeos')">
   <include src="sync_section.html">
 </if>
 <if expr="pp_ifdef('chromeos')">
   <section>
     <h3 i18n-content="sectionTitleInternet"></h3>
@@ skipping 51 matching lines @@
     </div>
     <div id="change-home-page-section" hidden>
       <div id="change-home-page-section-container" guest-visibility="disabled">
         <span id="home-page-ntp" class="home-page-label"
             i18n-content="homePageNtp"></span>
         <span id="home-page-url" class="home-page-label"></span>
         <button id="change-home-page" class="link-button"
             i18n-content="changeHomePage"></button>
       </div>
     </div>
-    <div class="checkbox" guest-visibility="disabled"><label>
-        <input type="checkbox" pref="bookmark_bar.show_on_all_tabs"
+    <div class="checkbox" guest-visibility="disabled">
+      <span class="controlled-setting-with-label">
+        <input id="show-bookmark-bars" type="checkbox"
+            pref="bookmark_bar.show_on_all_tabs"
             metric="Options_ShowBookmarksBar">
-        <span i18n-content="toolbarShowBookmarksBar"></span>
-    </label></div>
+        <span>
+          <label for="show-bookmark-bars"
+              i18n-content="toolbarShowBookmarksBar">
+          </label>
+          <span class="controlled-setting-indicator"
+              pref="bookmark_bar.show_on_all_tabs">
+          </span>
+        </span>
+      </span>
+    </div>
 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
     <div class="checkbox"><label>
         <input id="show-window-decorations" type="checkbox"
             pref="browser.custom_chrome_frame" metric="Options_CustomFrame"
             inverted_pref>
         <span i18n-content="showWindowDecorations"></span>
     </label></div>
 </if>
   </section>
 <if expr="pp_ifdef('chromeos')">
@@ skipping 39 matching lines @@
         <div class="settings-row">
           <select id="default-search-engine" class="weakrtl"></select>
           <span class="controlled-setting-indicator"
               pref="default_search_provider.enabled">
           </span>
           <button id="manage-default-search-engines"
               i18n-content="defaultSearchManageEngines">
           </button>
         </div>
         <div class="checkbox" guest-visibility="disabled">
-          <label id="instant-label">
+          <span class="controlled-setting-with-label">
             <!-- TODO(estade): metric? -->
             <input id="instant-enabled-control" type="checkbox"
                 pref="instant.enabled" dialog-pref>
-            <!-- TODO(estade) There's a link in here which should not be inside
-                 a <label>. -->
-            <span i18n-values=".innerHTML:instantPrefAndWarning"></span>
-          </label>
+            <span>
+              <!-- TODO(estade) There's a link in here which should not be
+                   inside a <label>. -->
+              <label for="instant-enabled-control"
+                  i18n-values=".innerHTML:instantPrefAndWarning">
+              </label>
+              <span id="instant-enabled-indicator"
+                  class="controlled-setting-indicator" pref="instant.enabled"
+                  dialog-pref>
+              </span>
+            </span>
+          </span>
         </div>
       </div>
   </section>
   <section guest-visibility="hidden">
     <h3 i18n-content="sectionTitleUsers"></h3>
 <if expr="pp_ifdef('chromeos')">
     <include src="sync_section.html">
 </if>
     <div id="profiles-section" hidden>
       <list id="profiles-list" class="settings-list" hidden></list>
@@ skipping 120 matching lines @@
                 i18n-content="safeBrowsingEnableProtection">
             </label>
             <span class="controlled-setting-indicator"
                 pref="safebrowsing.enabled">
             </span>
           </span>
         </span>
       </div>
 <if expr="pp_ifdef('_google_chrome')">
       <div class="checkbox">
-        <label id="spelling-label">
+        <span class="controlled-setting-with-label">
           <input id="spelling-enabled-control" type="checkbox"
               pref="spellcheck.use_spelling_service" dialog-pref>
-          <span i18n-content="spellingPref"></span>
-        </label>
+          <span>
+            <label for="spelling-enabled-control" i18n-content="spellingPref">
+            </label>
+            <span id="spelling-enabled-indicator"
+                class="controlled-setting-indicator"
+                pref="spellcheck.use_spelling_service" dialog-pref>
+            </span>
+          </span>
+        </span>
       </div>
       <div id="metricsReportingSetting" class="checkbox">
         <span class="controlled-setting-with-label">
 <if expr="pp_ifdef('chromeos')">
           <input id="metricsReportingEnabled"
               pref="cros.metrics.reportingEnabled" type="checkbox">
 </if>
 <if expr="not pp_ifdef('chromeos')">
           <input id="metricsReportingEnabled"
               pref="user_experience_metrics.reporting_enabled" type="checkbox">
@@ skipping 145 matching lines @@
   </section>
 </if>
   <section>
     <h3 i18n-content="advancedSectionTitleLanguages"></h3>
     <span class="settings-row" i18n-content="languageSectionLabel"></span>
     <div class="settings-row">
       <button id="language-button"
           i18n-content="languageAndSpellCheckSettingsButton"></button>
     </div>
     <div class="checkbox">
-      <label>
+      <span class="controlled-setting-with-label">
         <input id="enableTranslate" pref="translate.enabled"
             metric="Options_Translate" type="checkbox">
-        <span i18n-content="translateEnableTranslate"></span>
-      </label>
+        <span>
+          <label for="enableTranslate"i18n-content="translateEnableTranslate">
+          </label>
+          <span class="controlled-setting-indicator" pref="translate.enabled">
+          </span>
+        </span>
+      </span>
     </div>
   </section>
   <section>
     <h3 i18n-content="downloadLocationGroupName"></h3>
     <div>
       <div class="settings-row">
         <label>
           <span id="download-location-label"
               i18n-content="downloadLocationBrowseTitle">
           </span>
@@ skipping 134 matching lines @@
           i18n-content="factoryResetRestart">
       </button>
     </div>
   </section>
 </if>
 </if>
 <if expr="not is_macosx and not pp_ifdef('chromeos')">
   <section id="background-section">
     <h3 i18n-content="advancedSectionTitleBackground"></h3>
     <div class="checkbox">
-      <label>
+      <span class="controlled-setting-with-label">
         <input id="backgroundModeCheckbox" pref="background_mode.enabled"
             type="checkbox">
-        <span i18n-content="backgroundModeCheckbox"></span>
-      </label>
+        <span>
+          <label for="backgroundModeCheckbox"
+              i18n-content="backgroundModeCheckbox">
+          </label>
+          <span class="controlled-setting-indicator"
+              pref="background_mode.enabled">
+          </span>
+        </span>
+      </span>
     </div>
   </section>
 </if>
 </div>  <!-- advanced-settings-container -->
 </div>  <!-- advanced-settings -->
 <footer>
   <button id="advanced-settings-expander" class="link-button"
       i18n-content="showAdvancedSettings">
   </button>
 </footer>
 </div>