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

chrome/browser/sync/resources/configure.html

Index: chrome/browser/sync/resources/configure.html
===================================================================
--- chrome/browser/sync/resources/configure.html	(revision 108905)
+++ chrome/browser/sync/resources/configure.html	(working copy)
@@ -358,22 +358,15 @@
           args.syncApps;
       document.getElementById("appsItem").className = "sync-item-show";
     } else {
-      document.getElementById("appsItem").className = "sync-item-hide";
-    }
-    if (args.searchEnginesRegistered) {
-      document.getElementById("searchEnginesCheckbox").checked =
-          args.syncSearchEngines;
-      document.getElementById("searchEnginesItem").className = "sync-item-show";
-    } else {
-      document.getElementById("searchEnginesItem").className = "sync-item-hide";
-    }
-    if (args.sessionsRegistered) {
-      document.getElementById("sessionsCheckbox").checked = args.syncSessions;
-      document.getElementById("sessionsItem").className = "sync-item-show";
-    } else {
-      document.getElementById("sessionsItem").className = "sync-item-hide";
-    }
-
+      document.getElementById("appsItem").className = "sync-item-hide";
+    }
+    if (args.sessionsRegistered) {
+      document.getElementById("sessionsCheckbox").checked = args.syncSessions;
+      document.getElementById("sessionsItem").className = "sync-item-show";
+    } else {
+      document.getElementById("sessionsItem").className = "sync-item-hide";
+    }
+
     setCheckboxesToKeepEverythingSynced(args.syncAllDataTypes);
   }
 
@@ -461,9 +454,8 @@
         "syncPasswords": syncAll || f.passwordsCheckbox.checked,
         "syncAutofill": syncAll || f.autofillCheckbox.checked,
         "syncExtensions": syncAll || f.extensionsCheckbox.checked,
-        "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked,
-        "syncApps": syncAll || f.appsCheckbox.checked,
-        "syncSearchEngines": syncAll || f.searchEnginesCheckbox.checked,
+        "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked,
+        "syncApps": syncAll || f.appsCheckbox.checked,
         "syncSessions": syncAll || f.sessionsCheckbox.checked,
         "usePassphrase": (getRadioCheckedValue() == 'explicit'),
         "passphrase": f.passphrase.value
@@ -619,13 +611,6 @@
                      for="sessionsCheckbox" i18n-content="foreignsessions"
                      il8n-values="title:sessions"></label>
             </div>
-            <!-- Search Engines -->
-            <div class="sync-item-show" id="searchEnginesItem">
-              <input id="searchEnginesCheckbox" name="dataTypeCheckbox" type="checkbox">
-              <label id="searchEnginesCheckboxLabel" name="dataTypeLabel"
-                     for="searchEnginesCheckbox" i18n-content="searchengines"
-                     il8n-values="title:searchengines"></label>
-            </div>
           </div>
         </div>
       </div>