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

chrome/browser/ui/webui/sync_setup_handler.cc

Index: chrome/browser/ui/webui/sync_setup_handler.cc
===================================================================
--- chrome/browser/ui/webui/sync_setup_handler.cc	(revision 109292)
+++ chrome/browser/ui/webui/sync_setup_handler.cc	(working copy)
@@ -125,12 +125,6 @@
   if (sync_typed_urls)
     config->data_types.insert(syncable::TYPED_URLS);
 
-  bool sync_search_engines;
-  if (!result->GetBoolean("syncSearchEngines", &sync_search_engines))
-    return false;
-  if (sync_search_engines)
-    config->data_types.insert(syncable::SEARCH_ENGINES);
-
   bool sync_sessions;
   if (!result->GetBoolean("syncSessions", &sync_sessions))
     return false;
@@ -210,8 +204,6 @@
        pref_service->GetBoolean(prefs::kSyncExtensions)) ||
       ((types.find(syncable::TYPED_URLS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncTypedUrls)) ||
-      ((types.find(syncable::SEARCH_ENGINES) != types.end()) !=
-       pref_service->GetBoolean(prefs::kSyncSearchEngines)) ||
       ((types.find(syncable::SESSIONS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncSessions)) ||
       ((types.find(syncable::APPS) != types.end()) !=
@@ -341,7 +333,6 @@
     { "extensions", IDS_SYNC_DATATYPE_EXTENSIONS },
     { "typedURLs", IDS_SYNC_DATATYPE_TYPED_URLS },
     { "apps", IDS_SYNC_DATATYPE_APPS },
-    { "searchEngines", IDS_SYNC_DATATYPE_SEARCH_ENGINES },
     { "openTabs", IDS_SYNC_DATATYPE_TABS },
     { "syncZeroDataTypesError", IDS_SYNC_ZERO_DATA_TYPES_ERROR },
     { "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
@@ -594,8 +585,6 @@
           types.find(syncable::EXTENSIONS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncTypedUrls",
           types.find(syncable::TYPED_URLS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSearchEngines",
-          types.find(syncable::SEARCH_ENGINES) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSessions",
           types.find(syncable::SESSIONS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncApps",