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

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 108905)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -333,6 +333,9 @@
 // Disables syncing of preferences.
 const char kDisableSyncPreferences[]        = "disable-sync-preferences";
 
+// Disable syncing custom search engines.
+const char kDisableSyncSearchEngines[]      = "disable-sync-search-engines";
+
 // Disables syncing of themes.
 const char kDisableSyncThemes[]             = "disable-sync-themes";
 
@@ -536,9 +539,6 @@
 // Enables OAuth sign-in for sync.
 const char kEnableSyncOAuth[]               = "enable-sync-oauth";
 
-// Enables syncing custom search engines.
-const char kEnableSyncSearchEngines[]       = "enable-sync-search-engines";
-
 // Enables syncing browser sessions.
 const char kEnableSyncTabs[]                = "enable-sync-tabs";