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

chrome/browser/sync/sync_setup_wizard_unittest.cc

Index: chrome/browser/sync/sync_setup_wizard_unittest.cc
===================================================================
--- chrome/browser/sync/sync_setup_wizard_unittest.cc	(revision 109292)
+++ chrome/browser/sync/sync_setup_wizard_unittest.cc	(working copy)
@@ -313,8 +313,8 @@
       "{\"syncAllDataTypes\":false,\"syncBookmarks\":true,"
       "\"syncPreferences\":true,\"syncThemes\":false,\"syncPasswords\":false,"
       "\"syncAutofill\":false,\"syncExtensions\":false,\"syncTypedUrls\":true,"
-      "\"syncApps\":true,\"syncSearchEngines\":false,\"syncSessions\":false,"
-      "\"usePassphrase\":false,\"encryptAllData\":false}";
+      "\"syncApps\":true,\"syncSessions\":false,\"usePassphrase\":false,"
+      "\"encryptAllData\":false}";
   data_type_choices_value.Append(new StringValue(data_type_choices));
 
   // Simulate the user choosing data types; bookmarks, prefs, typed URLS, and
@@ -332,7 +332,6 @@
   EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::EXTENSIONS));
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::TYPED_URLS));
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::APPS));
-  EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::SEARCH_ENGINES));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(
       syncable::APP_NOTIFICATIONS));
 }