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

chrome/browser/resources/sync_setup_overlay.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   const OptionsPage = options.OptionsPage;
 
   // Variable to track if a captcha challenge was issued. If this gets set to
   // true, it stays that way until we are told about successful login from
   // the browser.  This means subsequent errors (like invalid password) are
@@ skipping 231 matching lines @@
       var result = JSON.stringify({
           "syncAllDataTypes": syncAll,
           "syncBookmarks": syncAll || $('bookmarks-checkbox').checked,
           "syncPreferences": syncAll || $('preferences-checkbox').checked,
           "syncThemes": syncAll || $('themes-checkbox').checked,
           "syncPasswords": syncAll || $('passwords-checkbox').checked,
           "syncAutofill": syncAll || $('autofill-checkbox').checked,
           "syncExtensions": syncAll || $('extensions-checkbox').checked,
           "syncTypedUrls": syncAll || $('typed-urls-checkbox').checked,
           "syncApps": syncAll || $('apps-checkbox').checked,
-          "syncSearchEngines": syncAll || $('search-engines-checkbox').checked,
           "syncSessions": syncAll || $('sessions-checkbox').checked,
           "encryptAllData": encryptAllData,
           "usePassphrase": usePassphrase,
           "isGooglePassphrase": googlePassphrase,
           "passphrase": customPassphrase
       });
       chrome.send('SyncSetupConfigure', [result]);
     },
 
     /**
@@ skipping 74 matching lines @@
         $('omnibox-item').className = "sync-item-show";
       } else {
         $('omnibox-item').className = "sync-item-hide";
       }
       if (args.appsRegistered) {
         $('apps-checkbox').checked = args.syncApps;
         $('apps-item').className = "sync-item-show";
       } else {
         $('apps-item').className = "sync-item-hide";
       }
-      if (args.searchEnginesRegistered) {
-        $('search-engines-checkbox').checked = args.syncSearchEngines;
-        $('search-engines-item').className = "sync-item-show";
-      } else {
-        $('search-engines-item').className = "sync-item-hide";
-      }
       if (args.sessionsRegistered) {
         $('sessions-checkbox').checked = args.syncSessions;
         $('sessions-item').className = "sync-item-show";
       } else {
         $('sessions-item').className = "sync-item-hide";
       }
 
       this.setCheckboxesToKeepEverythingSynced_(args.syncAllDataTypes);
     },
 
@@ skipping 478 matching lines @@
 
   SyncSetupOverlay.showStopSyncingUI = function() {
     SyncSetupOverlay.getInstance().showStopSyncingUI_();
   };
 
   // Export
   return {
     SyncSetupOverlay: SyncSetupOverlay
   };
 });