Options/MD Settings: use new prefs to drive import data dialog

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 89761e52f852c28089894607cc96484295b8c4aa..7524577dc9dc66824a1becd61a1a69f39fb77793 100644
--- a/chrome/browser/resources/options/import_data_overlay.html
+++ b/chrome/browser/resources/options/import_data_overlay.html
@@ -14,10 +14,12 @@
         <div class="checkbox controlled-setting-with-label"
               id="import-history-with-label">
           <label>
-            <input id="import-history" type="checkbox" pref="import_history">
+            <input id="import-history" type="checkbox"
+                pref="import_dialog_history">
             <span>
               <span i18n-content="importHistory"></span>
-              <span class="controlled-setting-indicator" pref="import_history">
+              <span class="controlled-setting-indicator"
+                  pref="import_dialog_history">
               </span>
             </span>
           </label>
@@ -26,11 +28,11 @@
             id="import-favorites-with-label">
           <label>
             <input id="import-favorites" type="checkbox"
-                pref="import_bookmarks">
+                pref="import_dialog_bookmarks">
             <span>
               <span i18n-content="importFavorites"></span>
               <span class="controlled-setting-indicator"
-                  pref="import_bookmarks"></span>
+                  pref="import_dialog_bookmarks"></span>
             </span>
           </label>
         </div>
@@ -38,11 +40,11 @@
             id="import-passwords-with-label">
           <label>
             <input id="import-passwords" type="checkbox"
-                pref="import_saved_passwords">
+                pref="import_dialog_saved_passwords">
             <span>
               <span i18n-content="importPasswords"></span>
               <span class="controlled-setting-indicator"
-                  pref="import_saved_passwords"></span>
+                  pref="import_dialog_saved_passwords"></span>
             </span>
           </label>
         </div>
@@ -50,11 +52,11 @@
             id="import-search-with-label">
           <label>
             <input id="import-search" type="checkbox"
-                pref="import_search_engine">
+                pref="import_dialog_search_engine">
             <span>
               <span i18n-content="importSearch"></span>
               <span class="controlled-setting-indicator"
-                  pref="import_search_engine"></span>
+                  pref="import_dialog_search_engine"></span>
             </span>
           </label>
         </div>
@@ -62,11 +64,11 @@
             id="import-autofill-form-data-with-label">
           <label>
             <input id="import-autofill-form-data" type="checkbox"
-                pref="import_autofill_form_data">
+                pref="import_dialog_autofill_form_data">
             <span i18n-content="importAutofillFormData"></span>
           </label>
           <span class="controlled-setting-indicator"
-              pref="import_autofill_form_data"></span>
+              pref="import_dialog_autofill_form_data"></span>
         </div>
       </div>
     </div>