Add fifth batch of controlled setting indicators

chrome/browser/resources/options/import_data_overlay.html

Index: chrome/browser/resources/options/import_data_overlay.html
diff --git a/chrome/browser/resources/options/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html
index 739a44b9afcc00f81e1ce9a84598a0f4ddacbb5f..7415dadc0b71d69d7abe0ca591ab24ebf8e97873 100644
--- a/chrome/browser/resources/options/import_data_overlay.html
+++ b/chrome/browser/resources/options/import_data_overlay.html
@@ -11,23 +11,54 @@
       </div>
       <div id="import-checkboxes">
         <div i18n-content="importDescription"></div>
-        <div class="checkbox"><label>
-          <input id="import-history" type="checkbox" pref="import_history">
-          <span for="import-history" i18n-content="importHistory"></span>
-        </label></div>
-        <div class="checkbox"><label>
-          <input id="import-favorites" type="checkbox" pref="import_bookmarks">
-          <span for="import-favorites" i18n-content="importFavorites"></span>
-        </label></div>
-        <div class="checkbox"><label>
-          <input id="import-passwords" type="checkbox"
-              pref="import_saved_passwords">
-          <span i18n-content="importPasswords"></span>
-        </label></div>
-        <div class="checkbox"><label>
-          <input id="import-search" type="checkbox" pref="import_search_engine">
-          <span i18n-content="importSearch"></span>
-        </label></div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-history" type="checkbox" pref="import_history">
+            <span>
+              <label for="import-history" i18n-content="importHistory"></label>
+              <span class="controlled-setting-indicator" pref="import_history">
+              </span>
+            </span>
+          </span>
+        </div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-favorites" type="checkbox"
+                pref="import_bookmarks">
+            <span>
+              <label for="import-favorites" i18n-content="importFavorites">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="import_bookmarks">
+              </span>
+            </span>
+          </span>
+        </div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-passwords" type="checkbox"
+                pref="import_saved_passwords">
+            <span>
+              <label for="import-passwords" i18n-content="importPasswords">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="import_saved_passwords">
+              </span>
+            </span>
+          </span>
+        </div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-search" type="checkbox"
+                pref="import_search_engine">
+            <span>
+              <label for="import-search" i18n-content="importSearch"></label>
+              <span class="controlled-setting-indicator"
+                  pref="import_search_engine">
+              </span>
+            </span>
+          </span>
+        </div>
       </div>
     </div>
     <div class="import-data-success" hidden>
@@ -40,12 +71,19 @@
       <div id="import-find-your-bookmarks">
         <span i18n-content="findYourImportedBookmarks"></span>
         <div class="checkbox">
-          <label>
+          <span class="controlled-setting-with-label">
             <input id="import-data-show-bookmarks-bar"
                 pref="bookmark_bar.show_on_all_tabs"
                 metric="Options_ShowBookmarksBar" type="checkbox">
-            <span i18n-content="toolbarShowBookmarksBar"></span>
-          </label>
+            <span>
+              <label for="import-data-show-bookmarks-bar"
+                  i18n-content="toolbarShowBookmarksBar">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="bookmark_bar.show_on_all_tabs">
+              </span>
+            </span>
+          </span>
         </div>
       </div>
     </div>