Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

chrome/browser/resources/sync_setup_overlay.html

 <div id="sync-setup-overlay" class="page" hidden>
   <div id="sync-setup-login" hidden>
     <h1 id="promo-title" i18n-content="promoTitle" hidden></h1>
     <div>
       <div id="sync-setup-login-content-column">
         <h1 id="sync-setup-overlay-title"
             i18n-content="syncSetupOverlayTitle">
         </h1>
         <div class="sign-in">
           <div id="top-blurb-error" class="reset-hidden" hidden>
@@ skipping 207 matching lines @@
                       name="dataTypeCheckbox">
                   <label for="themes-checkbox" i18n-content="themes"
                       i18n-values="title:themes" name="dataTypeLabel"></label>
                 </div>
                 <div id="sessions-item" class="sync-item-show">
                   <input id="sessions-checkbox" type="checkbox"
                       name="dataTypeCheckbox">
                   <label for="sessions-checkbox" i18n-content="openTabs"
                       il8n-values="title:tabs" name="dataTypeLabel"></label>
                 </div>
-                <div id="search-engines-item" class="sync-item-show">
-                  <input id="search-engines-checkbox" type="checkbox"
-                      name="dataTypeCheckbox">
-                  <label for="search-engines-checkbox"
-                      i18n-content="searchEngines"
-                      il8n-values="title:searchEngines"
-                      name="dataTypeLabel"></label>
-                </div>
               </div>
             </div>
           </div>
           <div class="sync-configuration-errors">
             <div id="error-text" i18n-content="syncZeroDataTypesError"
                 class="sync-configuration-error reset-hidden" hidden></div>
           </div>
           <div id="customize-sync-encryption">
             <hr>
             <h4 i18n-content="encryptedDataTypesTitle"></h4>
@@ skipping 102 matching lines @@
       <span i18n-values=".innerHTML:stopSyncingExplanation"></span>
     </div>
     <div class="action-area button-strip">
       <input id="stop-syncing-cancel" type="button"
           i18n-values="value:cancel">
       <input id="stop-syncing-ok" type="button"
           i18n-values="value:stopSyncingConfirm">
     </div>
   </div>
 </div>