Revert of Fix some more for= usage. (patchset #7 id:120001 of https://codereview.chromium.org/539383003/)

Reason for revert:
breaks linux_chromeos on try runs here and on buildbot

Original issue's description:
> Fix some more for= usage.
>
> Also fix some controlled settings indicators.
>
> BUG=409938
> R=dbeam@chromium.org
>
> Committed: https://crrev.com/ce80b519af00bb6259e8c63f91fee5263d818124
> Cr-Commit-Position: refs/heads/master@{#294681}

TBR=dbeam@chromium.org,estade@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=409938

Review URL: https://codereview.chromium.org/562023003

Cr-Commit-Position: refs/heads/master@{#294765}

13 files changed, 272 insertions, 355 deletions

diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 387ccee..6c5e16e 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -60,12 +60,10 @@
         <input type="checkbox"
             pref="browser.show_home_button"
             metric="Options_Homepage_HomeButton">
-        <span>
-          <span i18n-content="homePageShowHomeButton"></span>
-          <span class="controlled-setting-indicator"
-              pref="browser.show_home_button"></span>
-        </span>
+        <span i18n-content="homePageShowHomeButton"></span>
       </label>
+      <span class="controlled-setting-indicator"
+          pref="browser.show_home_button"></span>
     </div>
     <div id="change-home-page-section" hidden>
       <div id="change-home-page-section-container" guest-visibility="disabled">
@@ -83,12 +81,11 @@
         <input type="checkbox"
             pref="bookmark_bar.show_on_all_tabs"
             metric="Options_ShowBookmarksBar">
-        <span>
-          <span i18n-content="toolbarShowBookmarksBar"></span>
-          <span class="controlled-setting-indicator"
-              pref="bookmark_bar.show_on_all_tabs"></span>
-        </span>
+        <span i18n-content="toolbarShowBookmarksBar"></span>
       </label>
+      <span class="controlled-setting-indicator"
+          pref="bookmark_bar.show_on_all_tabs">
+      </span>
     </div>
 <if expr="is_posix and not chromeos and not is_macosx">
     <div class="checkbox"><label>
@@ -294,36 +291,32 @@
           <input id="alternateErrorPagesEnabled"
               pref="alternate_error_pages.enabled"
               metric="Options_LinkDoctorCheckbox" type="checkbox">
-          <span>
-            <span i18n-content="linkDoctorPref"></span>
-            <span class="controlled-setting-indicator"
-                pref="alternate_error_pages.enabled"></span>
-          </span>
+          <span i18n-content="linkDoctorPref"></span>
         </label>
+        <span class="controlled-setting-indicator"
+            pref="alternate_error_pages.enabled">
+        </span>
       </div>
       <div class="checkbox controlled-setting-with-label"
           guest-visibility="disabled">
         <label>
           <input pref="search.suggest_enabled"
               metric="Options_UseSuggestCheckbox" type="checkbox">
-          <span>
-            <span i18n-content="suggestPref"></span>
-            <span class="controlled-setting-indicator"
-                pref="search.suggest_enabled"></span>
-          </span>
+          <span i18n-content="suggestPref"></span>
         </label>
+        <span class="controlled-setting-indicator"
+            pref="search.suggest_enabled">
+        </span>
       </div>
       <div class="checkbox" guest-visibility="disabled">
         <span class="controlled-setting-with-label">
           <label>
             <input id="networkPredictionOptions"
                 metric="Options_DnsPrefetchCheckbox" type="checkbox">
-            <span>
-              <span i18n-content="networkPredictionEnabledDescription"></span>
-              <span class="controlled-setting-indicator"
-                  pref="net.network_prediction_options"></span>
-            </span>
+            <span i18n-content="networkPredictionEnabledDescription"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="net.network_prediction_options"></span>
         </span>
       </div>
       <div class="checkbox controlled-setting-with-label">
@@ -332,23 +325,21 @@
               metric="Options_SafeBrowsingExtendedReportingCheckbox"
               pref="safebrowsing.extended_reporting_enabled"
               type="checkbox">
-          <span>
-            <span i18n-content="safeBrowsingEnableExtendedReporting"></span>
-            <span class="controlled-setting-indicator"
-                pref="safebrowsing.extended_reporting_enabled"></span>
-          </span>
+          <span i18n-content="safeBrowsingEnableExtendedReporting"></span>
         </label>
+        <span class="controlled-setting-indicator"
+            pref="safebrowsing.extended_reporting_enabled">
+        </span>
       </div>
       <div class="checkbox controlled-setting-with-label">
         <label>
           <input pref="safebrowsing.enabled"
               metric="Options_SafeBrowsingCheckbox" type="checkbox">
-          <span>
-            <span i18n-content="safeBrowsingEnableProtection"></span>
-            <span class="controlled-setting-indicator"
-                pref="safebrowsing.enabled"></span>
-          </span>
+          <span i18n-content="safeBrowsingEnableProtection"></span>
         </label>
+        <span class="controlled-setting-indicator"
+            pref="safebrowsing.enabled">
+        </span>
       </div>
 <if expr="_google_chrome">
       <div class="checkbox controlled-setting-with-label">
@@ -356,13 +347,12 @@
           <input id="spelling-enabled-control" type="checkbox"
               metric="Options_SpellingServiceCheckbox"
               pref="spellcheck.use_spelling_service" dialog-pref>
-          <span>
-            <span i18n-content="spellingPref"></span>
-            <span id="spelling-enabled-indicator"
-                class="controlled-setting-indicator"
-                pref="spellcheck.use_spelling_service" dialog-pref>
-            </span>
+          <span i18n-content="spellingPref"></span>
         </label>
+        <span id="spelling-enabled-indicator"
+            class="controlled-setting-indicator"
+            pref="spellcheck.use_spelling_service" dialog-pref>
+        </span>
       </div>
       <div id="metricsReportingSetting"
           class="checkbox controlled-setting-with-label">
@@ -370,23 +360,20 @@
         <label>
           <input id="metricsReportingEnabled"
               pref="cros.metrics.reportingEnabled" type="checkbox">
-          <span>
-            <span i18n-content="enableLogging"></span>
-            <span class="controlled-setting-indicator"
-                pref="cros.metrics.reportingEnabled"></span>
-          </span>
+          <span i18n-content="enableLogging"></span>
         </label>
+        <span class="controlled-setting-indicator"
+            pref="cros.metrics.reportingEnabled"></span>
 </if>
 <if expr="not chromeos">
         <label>
           <input id="metricsReportingEnabled"
               pref="user_experience_metrics.reporting_enabled" type="checkbox">
-          <span>
-            <span i18n-content="enableLogging"></span>
-            <span class="controlled-setting-indicator"
-                pref="user_experience_metrics.reporting_enabled"></span>
-          </span>
+          <span i18n-content="enableLogging">
         </label>
+        <span class="controlled-setting-indicator"
+            pref="user_experience_metrics.reporting_enabled">
+        </span>
         <span id="metrics-reporting-reset-restart">
           <!-- Text filled by JavaScript -->
           <span></span><button class=
@@ -407,16 +394,14 @@
         <label>
           <input id="content-protection-attestation-enabled" type="checkbox"
               pref="cros.device.attestation_for_content_protection_enabled">
-          <span>
-            <span i18n-content="enableContentProtectionAttestation"></span>
-            <span class="controlled-setting-indicator"
-                pref="cros.device.attestation_for_content_protection_enabled">
-            </span>
-          </span>
+          <span i18n-content="enableContentProtectionAttestation"></span>
         </label>
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:contentProtectionAttestationLearnMoreURL">
         </a>
+        <span class="controlled-setting-indicator"
+            pref="cros.device.attestation_for_content_protection_enabled">
+        </span>
       </div>
 </if>
       <div id="hotword-search" hidden>
@@ -424,12 +409,11 @@
           <label>
             <input id="hotword-search-enable" pref="hotword.search_enabled_2"
                 metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
-            <span>
-              <span i18n-values=".innerHTML:hotwordSearchEnable"></span>
-              <span id="hotword-search-setting-indicator"
-                  pref="hotword.search_enabled_2" dialog-pref></span>
-            </span>
+            <span i18n-values=".innerHTML:hotwordSearchEnable"></span>
           </label>
+          <span id="hotword-search-setting-indicator"
+              pref="hotword.search_enabled_2" dialog-pref>
+          </span>
         </div>
       </div>
     </div>
@@ -468,10 +452,8 @@
       <label>
         <input id="autofill-enabled" pref="autofill.enabled"
             metric="Options_FormAutofill" type="checkbox">
-        <span>
-          <span i18n-content="autofillEnabled"></span>
-          <span class="controlled-setting-indicator" pref="autofill.enabled">
-          </span>
+        <span i18n-content="autofillEnabled"></span>
+        <span class="controlled-setting-indicator" pref="autofill.enabled">
         </span>
       </label>
       <button id="autofill-settings" class="link-button"
@@ -483,10 +465,9 @@
         <input id="password-manager-enabled"
             pref="profile.password_manager_enabled"
             metric="Options_PasswordManager" type="checkbox">
-        <span>
-          <span i18n-content="passwordManagerEnabled"></span>
-          <span class="controlled-setting-indicator"
-              pref="profile.password_manager_enabled"></span>
+        <span i18n-content="passwordManagerEnabled"></span>
+        <span class="controlled-setting-indicator"
+            pref="profile.password_manager_enabled"></span>
         </span>
       </label>
       <button id="manage-passwords" class="link-button"
@@ -501,7 +482,7 @@
     <h3 i18n-content="easyUnlockSectionTitle"></h3>
     <!-- Options shown when the user has not set up Easy Unlock -->
     <div id='easy-unlock-setup' hidden>
-      <div class="settings-row">
+      <div class="controlled-setting-with-label">
         <span i18n-content="easyUnlockSetupIntro"></span>
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:easyUnlockLearnMoreURL"></a>
@@ -511,7 +492,7 @@
     </div>
     <!-- Options shown when the user has set up Easy Unlock -->
     <div id='easy-unlock-enable' hidden>
-      <div class="settings-row">
+      <div class="controlled-setting-with-label">
         <span i18n-content="easyUnlockDescription"></span>
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:easyUnlockLearnMoreURL"></a>
@@ -592,12 +573,10 @@
       <label>
         <input pref="translate.enabled"
             metric="Options_Translate" type="checkbox">
-        <span>
-          <span i18n-content="translateEnableTranslate"></span>
-          <span class="controlled-setting-indicator" pref="translate.enabled">
-          </span>
-        </span>
+        <span i18n-content="translateEnableTranslate"></span>
       </label>
+      <span class="controlled-setting-indicator" pref="translate.enabled">
+      </span>
       <button id="manage-languages" class="link-button"
           i18n-content="manageLanguages"></button>
     </div>
@@ -625,12 +604,10 @@
           <input type="checkbox"
               pref="download.prompt_for_download"
               metric="Options_AskForSaveLocation">
-          <span>
-            <span i18n-content="downloadLocationAskForSaveLocation"></span>
-            <span class="controlled-setting-indicator"
-                pref="download.prompt_for_download"></span>
-          </span>
+          <span i18n-content="downloadLocationAskForSaveLocation"></span>
         </label>
+        <span class="controlled-setting-indicator"
+            pref="download.prompt_for_download"></span>
       </div>
 <if expr="chromeos">
       <div class="checkbox controlled-setting-with-label"
@@ -639,12 +616,10 @@
           <input type="checkbox"
               pref="gdata.disabled"
               metric="Options_DisableGData">
-          <span>
-            <span i18n-content="disableGData"></span>
-            <span class="controlled-setting-indicator" pref="gdata.disabled">
-            </span>
-          </span>
+          <span i18n-content="disableGData"></span>
         </label>
+        <span class="controlled-setting-indicator" pref="gdata.disabled">
+        </span>
       </div>
 </if>
       <div id="auto-open-file-types-section" hidden>
@@ -682,19 +657,17 @@
               i18n-content="cloudPrintDevicesPageButton">
       </button>
 
-      <div class="settings-row checkbox controlled-setting-with-label"
+      <div class="checkbox controlled-setting-with-label"
            i18n-values=".hidden: cloudPrintHideNotificationsCheckbox">
         <label>
           <input id="local-discovery-notifications-enabled"
               pref="local_discovery.notifications_enabled"
               type="checkbox"
               metric="LocalDiscoveryNotificationsDisabled_Settings">
-          <span>
-            <span i18n-content="cloudPrintEnableNotificationsLabel"></span>
-            <span class="controlled-setting-indicator"
-                  pref="local_discovery.notifications_enabled"></span>
-          </span>
+          <span i18n-content="cloudPrintEnableNotificationsLabel"></span>
         </label>
+        <span class="controlled-setting-indicator"
+              pref="local_discovery.notifications_enabled"></span>
       </div>
     </section>
 </if>
@@ -715,12 +688,10 @@
             <input
                 pref="settings.a11y.enable_menu" type="checkbox"
                 metric="Options_AccessibilitySystemMenu">
-            <span>
-              <span i18n-content="accessibilityAlwaysShowMenu"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.a11y.enable_menu"></span>
-            </span>
+            <span i18n-content="accessibilityAlwaysShowMenu"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.a11y.enable_menu"></span>
         </div>
       </div>
       <div class="option-name">
@@ -729,12 +700,10 @@
             <input
                 pref="settings.a11y.large_cursor_enabled" type="checkbox"
                 metric="Options_AccessibilityLargeMouseCursor">
-            <span>
-              <span i18n-content="accessibilityLargeCursor"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.a11y.large_cursor_enabled"></span>
-            </span>
+            <span i18n-content="accessibilityLargeCursor"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.a11y.large_cursor_enabled"></span>
         </div>
       </div>
       <div class="option-name">
@@ -743,12 +712,11 @@
             <input id="accessibility-high-contrast-check"
                 pref="settings.a11y.high_contrast_enabled" type="checkbox"
                 metric="Options_AccessibilityHighContrastMode">
-            <span>
-              <span i18n-content="accessibilityHighContrast"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.a11y.high_contrast_enabled"></span>
-            </span>
+            <span i18n-content="accessibilityHighContrast"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.a11y.high_contrast_enabled">
+          </span>
         </div>
       </div>
       <div id="accessibility-sticky-keys" class="option-name">
@@ -757,12 +725,11 @@
             <input id="accessibility-sticky-keys-check"
                 pref="settings.a11y.sticky_keys_enabled" type="checkbox"
                 metric="Options_AccessibilityStickyKeys">
-            <span>
-              <span i18n-content="accessibilityStickyKeys"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.a11y.sticky_keys_enabled"></span>
-            </span>
+            <span i18n-content="accessibilityStickyKeys"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.a11y.sticky_keys_enabled"></span>
+          </span>
         </div>
       </div>
       <div class="option-name">
@@ -771,12 +738,11 @@
             <input id="accessibility-spoken-feedback-check"
                 pref="settings.accessibility" type="checkbox"
                 metric="Options_AccessibilitySpokenFeedback">
-            <span>
-              <span i18n-content="accessibilitySpokenFeedback"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.accessibility"></span>
-            </span>
+            <span i18n-content="accessibilitySpokenFeedback"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.accessibility">
+          </span>
           <div id="accessibility-settings" hidden>
             <button id="accessibility-settings-button"
               i18n-content="accessibilitySettings"></button>
@@ -785,24 +751,21 @@
       </div>
       <div class="option-name">
         <div class="checkbox controlled-setting-with-label">
-          <label>
             <input
                 pref="settings.a11y.screen_magnifier" type="checkbox"
                 metric="Options_AccessibilityScreenMagnifier">
-            <span>
-              <span i18n-content="accessibilityScreenMagnifier"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.a11y.screen_magnifier"></span>
-            </span>
+            <span i18n-content="accessibilityScreenMagnifier"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.a11y.screen_magnifier"></span>
         </div>
       </div>
       <div class="option-name" id="accessibility-tap-dragging">
         <div class="checkbox">
           <label>
             <input id="accessibility-tap-dragging-check"
-                pref="settings.touchpad.enable_tap_dragging" type="checkbox"
-                metric="Options_AccessibilityTapDragging">
+                   pref="settings.touchpad.enable_tap_dragging" type="checkbox"
+                   metric="Options_AccessibilityTapDragging">
             <span i18n-content="accessibilityTapDragging"></span>
           </label>
         </div>
@@ -812,14 +775,12 @@
           <label>
             <input id="accessibility-autoclick-check"
                 pref="settings.a11y.autoclick" type="checkbox">
-            <span>
-              <span i18n-content="accessibilityAutoclick"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.a11y.autoclick"></span>
-            </span>
+            <span i18n-content="accessibilityAutoclick"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.a11y.autoclick"></span>
         </div>
-        <div>
+        <div class="checkbox">
           <!-- No whitespace between elements. -->
           <input type="checkbox" class="spacer-checkbox"><span
               id="accessibility-autoclick-label"
@@ -848,12 +809,11 @@
           <label>
             <input pref="settings.a11y.virtual_keyboard" type="checkbox"
                 metric="Options_AccessibilityOnScreenKeyboard">
-            <span>
-              <span i18n-content="accessibilityVirtualKeyboard"></span>
-              <span class="controlled-setting-indicator"
-                  pref="settings.a11y.virtual_keyboard"></span>
-            </span>
+            <span i18n-content="accessibilityVirtualKeyboard"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="settings.a11y.virtual_keyboard">
+          </span>
         </div>
       </div>
   </section>
@@ -878,12 +838,10 @@
       <label>
         <input pref="background_mode.enabled"
             type="checkbox">
-        <span>
-          <span i18n-content="backgroundModeCheckbox"></span>
-          <span class="controlled-setting-indicator"
-              pref="background_mode.enabled"></span>
-        </span>
+        <span i18n-content="backgroundModeCheckbox"></span>
       </label>
+      <span class="controlled-setting-indicator"
+          pref="background_mode.enabled"></span>
     </div>
 </if>
     <div class="checkbox controlled-setting-with-label">
diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html
index 07e409e..4454594 100644
--- a/chrome/browser/resources/options/content_settings.html
+++ b/chrome/browser/resources/options/content_settings.html
@@ -9,41 +9,35 @@
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="cookies" value="allow">
-            <span>
-              <span i18n-content="cookiesAllow"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="cookies" value="allow"></span>
-            </span>
+            <span i18n-content="cookiesAllow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="cookies" value="allow"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="cookies" value="session">
-            <span>
-              <span i18n-content="cookies_session_only"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="cookies" value="session"></span>
-            </span>
+            <span i18n-content="cookies_session_only"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="cookies" value="session"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="cookies" value="block">
-            <span>
-              <span i18n-content="cookiesBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="cookies" value="block"></span>
-            </span>
+            <span i18n-content="cookiesBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="cookies" value="block"></span>
         </div>
         <div class="checkbox controlled-setting-with-label">
           <label>
             <input pref="profile.block_third_party_cookies" type="checkbox">
-            <span>
-              <span i18n-content="cookies_block_3rd_party"></span>
-              <span class="controlled-setting-indicator"
-                  pref="profile.block_third_party_cookies"></span>
+            <span i18n-content="cookies_block_3rd_party"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="profile.block_third_party_cookies">
+          </span>
         </div>
         <!-- TODO(jochen): remove the div with the clear cookies on exit option
                            once this has shipped. -->
@@ -73,19 +67,18 @@
           <label>
             <input type="radio" name="images" value="allow">
             <span i18n-content="imagesAllow"></span>
-            <span class="controlled-setting-indicator"
-                content-setting="images" value="allow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="images" value="allow"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="images" value="block">
-            <span>
-              <span i18n-content="imagesBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="images" value="block"></span>
-            </span>
+            <span i18n-content="imagesBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="images" value="block">
+          </span>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="images"
@@ -100,22 +93,18 @@
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="javascript" value="allow">
-            <span>
-              <span i18n-content="javascriptAllow"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="javascript" value="allow"></span>
-            </span>
+            <span i18n-content="javascriptAllow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="javascript" value="allow"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="javascript" value="block">
-            <span>
-              <span i18n-content="javascriptBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="javascript" value="block"></span>
-            </span>
+            <span i18n-content="javascriptBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="javascript" value="block"></span>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="javascript"
@@ -154,32 +143,26 @@
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="plugins" value="allow">
-            <span>
-              <span i18n-content="pluginsAllow"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="plugins" value="allow"></span>
-            </span>
+            <span i18n-content="pluginsAllow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="plugins" value="allow"></span>
         </div>
         <div id="click_to_play" class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="plugins" value="ask">
-            <span>
-              <span i18n-content="pluginsAsk"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="plugins" value="ask"></span>
-            </span>
+            <span i18n-content="pluginsAsk"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="plugins" value="ask"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="plugins" value="block">
-            <span>
-              <span i18n-content="pluginsBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="plugins" value="block"></span>
-            </span>
+            <span i18n-content="pluginsBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="plugins" value="block"></span>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="plugins"
@@ -198,22 +181,18 @@
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="popups" value="allow">
-            <span>
-              <span i18n-content="popupsAllow"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="popups" value="allow"></span>
-            </span>
+            <span i18n-content="popupsAllow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="popups" value="allow"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="popups" value="block">
-            <span>
-              <span i18n-content="popupsBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="popups" value="block"></span>
-            </span>
+            <span i18n-content="popupsBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="popups" value="block"></span>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="popups"
@@ -228,33 +207,27 @@
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="location" value="allow">
-            <span>
-              <span i18n-content="locationAllow"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="location" value="allow"></span>
-            </span>
+            <span i18n-content="locationAllow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="location" value="allow"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="location" value="ask">
-            <span>
-              <span i18n-content="locationAsk"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="location" value="ask"></span>
-            </span>
+            <span i18n-content="locationAsk"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="location" value="ask"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="location"
                 value="block">
-            <span>
-              <span i18n-content="locationBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="location" value="block"></span>
-            </span>
+            <span i18n-content="locationBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="location" value="block"></span>
         </div>
 <if expr="enable_google_now">
         <div class="checkbox controlled-setting-with-label"
@@ -263,12 +236,10 @@
             <input pref="googlegeolocationaccess.enabled"
                 metric="Options_GoogleGeolocationAccessCheckbox"
                 type="checkbox">
-            <span>
-              <span i18n-content="googleGeolocationAccessEnable"></span>
-              <span class="controlled-setting-indicator"
-                  pref="googlegeolocationaccess.enabled"></span>
-            </span>
+            <span i18n-content="googleGeolocationAccessEnable"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="googlegeolocationaccess.enabled"></span>
         </div>
 </if>
         <div class="settings-row">
@@ -284,32 +255,26 @@
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="notifications" value="allow">
-            <span>
-              <span i18n-content="notificationsAllow"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="notifications" value="allow"></span>
-            </span>
+            <span i18n-content="notificationsAllow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="notifications" value="allow"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="notifications" value="ask">
-            <span>
-              <span i18n-content="notificationsAsk"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="notifications" value="ask"></span>
-            </span>
+            <span i18n-content="notificationsAsk"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="notifications" value="ask"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="notifications" value="block">
-            <span>
-              <span i18n-content="notificationsBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="notifications" value="block"></span>
-            </span>
+            <span i18n-content="notificationsBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="notifications" value="block"></span>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="notifications"
@@ -397,25 +362,20 @@
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="media-stream" value="ask">
-            <span>
-              <span id="media-stream-ask-label" i18n-content="mediaStreamAsk">
-              </span>
-              <span class="controlled-setting-indicator"
-                  content-setting="media-stream" value="ask"></span>
-            </span>
+            <span id="media-stream-ask-label" i18n-content="mediaStreamAsk">
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="media-stream" value="ask"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input id="media-stream-block" type="radio" name="media-stream"
                 value="block">
-            <span>
-              <span id="media-stream-block-label"
-                 i18n-content="mediaStreamBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="media-stream" value="block"></span>
+            <span id="media-stream-block-label" i18n-content="mediaStreamBlock">
             </span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="media-stream" value="block"></span>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="media-stream"
@@ -464,36 +424,29 @@
           <label>
             <input type="radio" name="multiple-automatic-downloads"
                 value="allow">
-            <span>
-              <span i18n-content="multipleAutomaticDownloadsAllow"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="multiple-automatic-downloads" value="allow">
-              </span>
-            </span>
+            <span i18n-content="multipleAutomaticDownloadsAllow"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="multiple-automatic-downloads" value="allow">
+          </span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="multiple-automatic-downloads" value="ask">
-            <span>
-              <span i18n-content="multipleAutomaticDownloadsAsk"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="multiple-automatic-downloads" value="ask">
-              </span>
-            </span>
+            <span i18n-content="multipleAutomaticDownloadsAsk"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="multiple-automatic-downloads" value="ask"></span>
         </div>
         <div class="radio controlled-setting-with-label">
           <label>
             <input type="radio" name="multiple-automatic-downloads"
                 value="block">
-            <span>
-              <span i18n-content="multipleAutomaticDownloadsBlock"></span>
-              <span class="controlled-setting-indicator"
-                  content-setting="multiple-automatic-downloads" value="block">
-              </span>
-            </span>
+            <span i18n-content="multipleAutomaticDownloadsBlock"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              content-setting="multiple-automatic-downloads" value="block">
+          </span>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button"
diff --git a/chrome/browser/resources/options/controlled_setting.css b/chrome/browser/resources/options/controlled_setting.css
index 22d02ed..71cc69a 100644
--- a/chrome/browser/resources/options/controlled_setting.css
+++ b/chrome/browser/resources/options/controlled_setting.css
@@ -4,6 +4,13 @@
 
 /* Controlled setting indicator and bubble. */
 
+.controlled-setting-with-label {
+  -webkit-box-align: center;
+  display: -webkit-box;
+  padding-bottom: 7px;
+  padding-top: 7px;
+}
+
 .controlled-setting-with-label input + span {
   -webkit-box-align: center;
   -webkit-box-flex: 1;
@@ -11,10 +18,15 @@
   display: -webkit-box;
 }
 
-.controlled-setting-with-label input:disabled + span {
+.controlled-setting-with-label input:disabled + span label {
   color: #999;
 }
 
+.controlled-setting-with-label label {
+  display: inline;
+  padding: 0;
+}
+
 .controlled-setting-indicator:not([controlled-by]) {
   display: none;
 }
diff --git a/chrome/browser/resources/options/home_page_overlay.html b/chrome/browser/resources/options/home_page_overlay.html
index 955ff08..a510168 100644
--- a/chrome/browser/resources/options/home_page_overlay.html
+++ b/chrome/browser/resources/options/home_page_overlay.html
@@ -2,38 +2,42 @@
   <div class="close-button"></div>
   <h1 i18n-content="homePageOverlay"></h1>
   <div class="content-area">
-    <div class="radio controlled-setting-with-label">
-      <label>
+    <div class="radio">
+      <span class="controlled-setting-with-label">
         <input id="homepage-use-ntp" type="radio" name="homepage"
             pref="homepage_is_newtabpage" value="true"
             metric="Options_Homepage_IsNewTabPage" dialog-pref>
         <span>
-          <span i18n-content="homePageUseNewTab"></span>
+          <label for="homepage-use-ntp" i18n-content="homePageUseNewTab">
+          </label>
           <span class="controlled-setting-indicator"
-              pref="homepage_is_newtabpage" value="true" dialog-pref></span>
+              pref="homepage_is_newtabpage" value="true" dialog-pref>
+          </span>
         </span>
-      </label>
+      </span>
     </div>
-    <div class="radio controlled-setting-with-label">
-      <label>
+    <div class="radio">
+      <span class="controlled-setting-with-label">
         <input id="homepage-use-url" type="radio" name="homepage"
             pref="homepage_is_newtabpage" value="false"
             metric="Options_Homepage_IsNewTabPage" dialog-pref>
         <span>
-          <span id="homepage-use-url-label" i18n-content="homePageUseURL">
-          </span>
+          <label id="homepage-use-url-label" i18n-content="homePageUseURL"
+              for="homepage-use-url">
+          </label>
           <span class="controlled-setting-indicator"
-              pref="homepage_is_newtabpage" value="false" dialog-pref></span>
+              pref="homepage_is_newtabpage" value="false" dialog-pref>
+          </span>
+          <input id="homepage-url-field" type="url" data-type="url"
+              class="weakrtl favicon-cell stretch" pref="homepage"
+              aria-labelledby="homepage-use-url-label"
+              metric="Options_Homepage_URL" dialog-pref>
+          </input>
+          <span id="homepage-url-field-indicator"
+              class="controlled-setting-indicator" pref="homepage"
+              dialog-pref>
+          </span>
         </span>
-      </label>
-      <input id="homepage-url-field" type="url" data-type="url"
-          class="weakrtl favicon-cell stretch" pref="homepage"
-          aria-labelledby="homepage-use-url-label"
-          metric="Options_Homepage_URL" dialog-pref>
-      </input>
-      <span id="homepage-url-field-indicator"
-          class="controlled-setting-indicator" pref="homepage"
-          dialog-pref>
       </span>
     </div>
   </div>
diff --git a/chrome/browser/resources/options/hotword_confirm_overlay.html b/chrome/browser/resources/options/hotword_confirm_overlay.html
index 11103ef..25a61b3 100644
--- a/chrome/browser/resources/options/hotword_confirm_overlay.html
+++ b/chrome/browser/resources/options/hotword_confirm_overlay.html
@@ -23,12 +23,16 @@
     </div>
   </div>
   <div id="audio-logging-bar" class="gray-bottom-bar checkbox">
-    <label>
-      <input
+    <span class="controlled-setting-with-label">
+      <input id="hotword-audio-logging-enable"
           pref="hotword.audio_logging_enabled"
           metric="Options_Hotword_AudioLogging_Checkbox"
           type="checkbox" dialog-pref checked>
-      <span i18n-content="hotwordAudioLoggingEnable"></span>
-    </label>
+      <span>
+        <label for="hotword-audio-logging-enable"
+            i18n-content="hotwordAudioLoggingEnable">
+        </label>
+      </span>
+    </span>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html
index 7a2aa02..ce7bdb6 100644
--- a/chrome/browser/resources/options/import_data_overlay.html
+++ b/chrome/browser/resources/options/import_data_overlay.html
@@ -15,48 +15,40 @@
               id="import-history-with-label">
           <label>
             <input id="import-history" type="checkbox" pref="import_history">
-            <span>
-              <span i18n-content="importHistory"></span>
-              <span class="controlled-setting-indicator" pref="import_history">
-              </span>
-            </span>
+            <span i18n-content="importHistory"></span>
           </label>
+          <span class="controlled-setting-indicator" pref="import_history">
+          </span>
         </div>
         <div class="checkbox controlled-setting-with-label"
             id="import-favorites-with-label">
           <label>
             <input id="import-favorites" type="checkbox"
                 pref="import_bookmarks">
-            <span>
-              <span i18n-content="importFavorites"></span>
-              <span class="controlled-setting-indicator"
-                  pref="import_bookmarks"></span>
-            </span>
+            <span i18n-content="importFavorites"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="import_bookmarks"></span>
         </div>
         <div class="checkbox controlled-setting-with-label"
             id="import-passwords-with-label">
           <label>
             <input id="import-passwords" type="checkbox"
                 pref="import_saved_passwords">
-            <span>
-              <span i18n-content="importPasswords"></span>
-              <span class="controlled-setting-indicator"
-                  pref="import_saved_passwords"></span>
-            </span>
+            <span i18n-content="importPasswords"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="import_saved_passwords"></span>
         </div>
         <div class="checkbox controlled-setting-with-label"
             id="import-search-with-label">
           <label>
             <input id="import-search" type="checkbox"
                 pref="import_search_engine">
-            <span>
-              <span i18n-content="importSearch"></span>
-              <span class="controlled-setting-indicator"
-                  pref="import_search_engine"></span>
-            </span>
+            <span i18n-content="importSearch"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="import_search_engine"></span>
         </div>
         <div class="checkbox controlled-setting-with-label"
             id="import-autofill-form-data-with-label">
@@ -84,12 +76,10 @@
             <input id="import-data-show-bookmarks-bar"
                 pref="bookmark_bar.show_on_all_tabs"
                 metric="Options_ShowBookmarksBar" type="checkbox">
-            <span>
-              <span i18n-content="toolbarShowBookmarksBar"></span>
-              <span class="controlled-setting-indicator"
-                  pref="bookmark_bar.show_on_all_tabs"></span>
-            </span>
+            <span i18n-content="toolbarShowBookmarksBar"></span>
           </label>
+          <span class="controlled-setting-indicator"
+              pref="bookmark_bar.show_on_all_tabs"></span>
         </div>
       </div>
     </div>
diff --git a/chrome/browser/resources/options/language_add_language_overlay.html b/chrome/browser/resources/options/language_add_language_overlay.html
index 0cbf1b6..ca8947a 100644
--- a/chrome/browser/resources/options/language_add_language_overlay.html
+++ b/chrome/browser/resources/options/language_add_language_overlay.html
@@ -2,10 +2,9 @@
   <div class="close-button"></div>
   <h1 i18n-content="addLanguageTitle"></h1>
   <div class="content-area">
-    <label id="add-language-overlay-language-list-label"
+    <label for="add-language-overlay-language-list"
         i18n-content="addLanguageSelectLabel"></label>
-    <select id="add-language-overlay-language-list"
-        aria-labelledby="add-language-overlay-language-list-label"></select>
+    <select id="add-language-overlay-language-list"></select>
   </div>
   <div class="action-area button-strip">
     <button id="add-language-overlay-cancel-button" i18n-content="cancel">
diff --git a/chrome/browser/resources/options/manage_profile_overlay.html b/chrome/browser/resources/options/manage_profile_overlay.html
index 8d66509..3a5eb85 100644
--- a/chrome/browser/resources/options/manage_profile_overlay.html
+++ b/chrome/browser/resources/options/manage_profile_overlay.html
@@ -10,7 +10,9 @@
       <grid id="manage-profile-icon-grid"></grid>
       <div id="manage-profile-name-input-container">
         <label>
-          <span i18n-content="manageProfilesNameLabel"></span>
+          <span id="manage-profile-name-label" for="manage-profile-name"
+              i18n-content="manageProfilesNameLabel">
+          </span>
           <input id="manage-profile-name" type="text" pattern=".*\S.*" required>
         </label>
       </div>
@@ -81,7 +83,7 @@
       <grid id="create-profile-icon-grid"></grid>
       <div id="create-profile-name-input-container">
         <label>
-          <span id="create-profile-name-label"
+          <span id="create-profile-name-label" for="create-profile-name"
               i18n-content="manageProfilesNameLabel">
           </span>
           <input id="create-profile-name" type="text" required>
@@ -92,7 +94,9 @@
       <div id="create-shortcut-container" class="checkbox" hidden>
         <label>
           <input id="create-shortcut" type="checkbox">
-          <span i18n-content="createProfileShortcutCheckbox"></span>
+          <span for="create-shortcut"
+              i18n-content="createProfileShortcutCheckbox">
+          </span>
         </label>
       </div>
       <div id="create-profile-supervised-container" class="checkbox">
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.css b/chrome/browser/resources/options/reset_profile_settings_overlay.css
index 1228697..3614e0a 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.css
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.css
@@ -48,13 +48,15 @@
 }
 
 #expand-feedback {
-  background: url('chrome://theme/IDR_QUESTION_MARK') no-repeat center;
+  background: center bottom no-repeat;
+  background-image: url('chrome://theme/IDR_QUESTION_MARK');
   display: inline-block;
   height: 14px;
   opacity: 0.33;
+  vertical-align: text-top;
   width: 14px;
 }
 
 #expand-feedback:hover {
   opacity: 1;
-}
+}
\ No newline at end of file
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.html b/chrome/browser/resources/options/reset_profile_settings_overlay.html
index b92c9fd..98d5248 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.html
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.html
@@ -21,15 +21,15 @@
       </div>
     </div>
   </div>
-  <div id="feedback-bar"
-      class="gray-bottom-bar checkbox controlled-setting-with-label">
-    <label>
+  <div id="feedback-bar" class="gray-bottom-bar checkbox">
+    <span class="controlled-setting-with-label">
       <input id="send-settings" type="checkbox" checked>
       <span>
-        <span i18n-content="resetProfileSettingsFeedback"></span>
-        <span id="expand-feedback"></span>
+        <label for="send-settings" i18n-content="resetProfileSettingsFeedback">
+        </label>
+        <div id='expand-feedback'></div>
       </span>
-    </label>
+    </span>
     <div id="feedback-template" hidden>
       <div>
         <table>
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.js b/chrome/browser/resources/options/reset_profile_settings_overlay.js
index 3dd1b79..d216902 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.js
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.js
@@ -28,18 +28,17 @@ cr.define('options', function() {
     initializePage: function() {
       Page.prototype.initializePage.call(this);
 
-      $('reset-profile-settings-dismiss').onclick = function(e) {
+      $('reset-profile-settings-dismiss').onclick = function(event) {
         ResetProfileSettingsOverlay.dismiss();
       };
-      $('reset-profile-settings-commit').onclick = function(e) {
+      $('reset-profile-settings-commit').onclick = function(event) {
         ResetProfileSettingsOverlay.setResettingState(true);
         chrome.send('performResetProfileSettings',
                     [$('send-settings').checked]);
       };
-      $('expand-feedback').onclick = function(e) {
+      $('expand-feedback').onclick = function(event) {
         var feedbackTemplate = $('feedback-template');
         feedbackTemplate.hidden = !feedbackTemplate.hidden;
-        e.preventDefault();
       };
     },
 
diff --git a/chrome/browser/resources/options/startup_section.html b/chrome/browser/resources/options/startup_section.html
index fd14dab..d0f3f2b 100644
--- a/chrome/browser/resources/options/startup_section.html
+++ b/chrome/browser/resources/options/startup_section.html
@@ -7,36 +7,30 @@
         <input type="radio" name="startup" value="5"
             pref="session.restore_on_startup"
             metric="Options_Startup_NewTab">
-        <span>
-          <span i18n-content="startupShowNewTab"></span>
-          <span class="controlled-setting-indicator"
-              pref="session.restore_on_startup" value="5"></span>
-        </span>
+        <span i18n-content="startupShowNewTab"></span>
       </label>
+      <span class="controlled-setting-indicator"
+          pref="session.restore_on_startup" value="5"></span>
     </div>
     <div class="radio controlled-setting-with-label">
       <label>
         <input id="startup-restore-session" type="radio" name="startup"
             value="1" pref="session.restore_on_startup"
             metric="Options_Startup_LastSession">
-        <span>
-          <span i18n-content="startupRestoreLastSession"></span>
-          <span class="controlled-setting-indicator"
-              pref="session.restore_on_startup" value="1"></span>
-        </span>
+        <span i18n-content="startupRestoreLastSession"></span>
       </label>
+      <span class="controlled-setting-indicator"
+          pref="session.restore_on_startup" value="1"></span>
     </div>
     <div class="radio controlled-setting-with-label">
       <label>
         <input id="startup-show-pages" type="radio" name="startup"
             pref="session.restore_on_startup"
             value="4" metric="Options_Startup_Custom">
-        <span>
-          <span i18n-content="startupShowPages"></span>
-          <span class="controlled-setting-indicator"
-              pref="session.restore_on_startup" value="4"></span>
-        </span>
+        <span i18n-content="startupShowPages"></span>
       </label>
+      <span class="controlled-setting-indicator"
+          pref="session.restore_on_startup" value="4"></span>
       <button id="startup-set-pages" class="link-button"
           i18n-content="startupSetPages">
       </button>
diff --git a/chrome/browser/resources/options/sync_section.html b/chrome/browser/resources/options/sync_section.html
index 83fbc8e..9c3354b 100644
--- a/chrome/browser/resources/options/sync_section.html
+++ b/chrome/browser/resources/options/sync_section.html
@@ -37,13 +37,11 @@
         <input type="checkbox"
             metric="Options_ScreenLock"
             pref="settings.enable_screen_lock">
-       <span>
-         <span i18n-content="enableScreenlock"></span>
-         <span class="controlled-setting-indicator"
-            i18n-values="textshared:screenLockShared"
-            pref="settings.enable_screen_lock"></span>
-       </span>
+        <span i18n-content="enableScreenlock"></span>
       </label>
+      <span class="controlled-setting-indicator"
+          i18n-values="textshared:screenLockShared"
+          pref="settings.enable_screen_lock"></span>
     </div>
   </div>
 </if>  <!-- chromeos -->