Add third 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 236 matching lines @@
             <label for="dnsPrefetchingEnabled"
                 i18n-content="networkPredictionEnabledDescription">
             </label>
             <span class="controlled-setting-indicator"
                 pref="dns_prefetching.enabled">
             </span>
           </span>
         </span>
       </div>
       <div class="checkbox">
-        <label>
+        <span class="controlled-setting-with-label">
           <input id="safeBrowsingEnabled" pref="safebrowsing.enabled"
               metric="Options_SafeBrowsingCheckbox" type="checkbox">
-          <span i18n-content="safeBrowsingEnableProtection"></span>
-        </label>
+          <span>
+            <label for="safeBrowsingEnabled"
+                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">
           <input id="spelling-enabled-control" type="checkbox"
               pref="spellcheck.use_spelling_service">
           <span i18n-content="spellingPref"></span>
         </label>
       </div>
       <div id="metricsReportingSetting" class="checkbox">
-        <label>
+        <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">
 </if>
-          <span i18n-content="enableLogging"></span>
-        </label>
+          <span>
+            <label for="metricsReportingEnabled" i18n-content="enableLogging">
+            </label>
+            <span class="controlled-setting-indicator"
+                pref="user_experience_metrics.reporting_enabled">
+            </span>
+          </span>
+        </span>
       </div>
 </if>  <!-- pp_ifdef('_google_chrome') -->
       <div class="checkbox">
         <label>
           <input id="do-not-track-enabled" pref="enable_do_not_track"
               metric="Options_DoNotTrackCheckbox" type="checkbox">
           <span i18n-content="doNotTrack"></span>
         </label>
       </div>
     </div>
@@ skipping 22 matching lines @@
             i18n-content="addBluetoothDevice" hidden></button>
         <button id="bluetooth-reconnect-device"
             i18n-content="bluetoothConnectDevice" disabled hidden></button>
       </div>
     </div>
   </section>
 </if>  <!-- pp_ifdef('chromeos') -->
   <section id="passwords-and-autofill-section">
     <h3 i18n-content="passwordsAndAutofillGroupName"></h3>
     <div class="checkbox">
-      <label>
+      <span class="controlled-setting-with-label">
         <input id="autofill-enabled" pref="autofill.enabled"
             metric="Options_FormAutofill" type="checkbox">
-        <span i18n-content="autofillEnabled"></span>
-      </label>
-      <button id="autofill-settings" class="link-button"
-          pref="autofill.enabled"
-          i18n-content="manageAutofillSettings"></button>
+        <span>
+          <label for="autofill-enabled" i18n-content="autofillEnabled"></label>
+          <span class="controlled-setting-indicator" pref="autofill.enabled">
+          </span>
+          <button id="autofill-settings" class="link-button"
+              i18n-content="manageAutofillSettings">
+          </button>
+        </span>
+      </span>
     </div>
     <div class="checkbox">
-      <label>
+      <span class="controlled-setting-with-label">
         <input id="password-manager-enabled"
             pref="profile.password_manager_enabled"
             metric="Options_PasswordManager" type="checkbox">
-        <span i18n-content="passwordManagerEnabled"></span>
-      </label>
-      <button id="manage-passwords" class="link-button"
-          i18n-content="managePasswords"
-          pref="profile.password_manager_enabled"></button>
+        <span>
+          <label for="password-manager-enabled"
+              i18n-content="passwordManagerEnabled">
+          </label>
+          <span class="controlled-setting-indicator"
+              pref="profile.password_manager_enabled">
+          </span>
+          <button id="manage-passwords" class="link-button"
+              i18n-content="managePasswords">
+          </button>
+        </span>
+      </span>
     </div>
     <div class="checkbox" id="password-generation-checkbox">
       <label>
         <input id="password-generation-enabled" pref="password_generation.enabled"
             metric="Options_PasswordGenerationCheckbox" type="checkbox">
         <span i18n-content="passwordGenerationEnabledDescription"></span>
       </label>
     </div>
 <if expr="is_macosx">
     <div id="mac-passwords-warning" i18n-content="macPasswordsWarning" hidden>
@@ skipping 65 matching lines @@
             metric="Options_Translate" type="checkbox">
         <span i18n-content="translateEnableTranslate"></span>
       </label>
     </div>
   </section>
   <section>
     <h3 i18n-content="downloadLocationGroupName"></h3>
     <div>
       <div class="settings-row">
         <label>
-          <span i18n-content="downloadLocationBrowseTitle"></span>
+          <span id="download-location-label"
+              i18n-content="downloadLocationBrowseTitle">
+          </span>
           <input id="downloadLocationPath" class="weakrtl" type="text"
-            size="36" readonly>
+              size="36" readonly>
         </label>
         <button id="downloadLocationChangeButton"
-            pref="download.prompt_for_download"
-            i18n-content="downloadLocationChangeButton"></button>
+            i18n-content="downloadLocationChangeButton">
+        </button>
+        <span class="controlled-setting-indicator"
+          pref="download.default_directory">
+        </span>
       </div>
       <div class="checkbox">
-        <label>
-          <input type="checkbox"
-              pref="download.prompt_for_download"
-              metric="Options_AskForSaveLocation">
-          <span i18n-content="downloadLocationAskForSaveLocation"></span>
-        </label>
+        <span class="controlled-setting-with-label">
+          <input id="prompt-for-download" type="checkbox"
+                pref="download.prompt_for_download"
+                metric="Options_AskForSaveLocation">
+          <span>
+            <label for="prompt-for-download"
+                i18n-content="downloadLocationAskForSaveLocation">
+            </label>
+            <span class="controlled-setting-indicator"
+                pref="download.prompt_for_download">
+            </span>
+          </span>
+        </span>
       </div>
 <if expr="pp_ifdef('chromeos')">
       <div class="checkbox" guest-visibility="disabled">
         <label>
           <input type="checkbox"
               pref="gdata.disabled"
               metric="Options_DisableGData">
           <span i18n-content="disableGData"></span>
         </label>
       </div>
@@ skipping 116 matching lines @@
   </section>
 </if>
 </div>  <!-- advanced-settings-container -->
 </div>  <!-- advanced-settings -->
 <footer>
   <button id="advanced-settings-expander" class="link-button"
       i18n-content="showAdvancedSettings">
   </button>
 </footer>
 </div>