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

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
===================================================================
--- chrome/common/pref_names.cc	(revision 108653)
+++ chrome/common/pref_names.cc	(working copy)
@@ -255,6 +255,16 @@
 // 2 - block all cookies
 const char kCookieBehavior[] = "security.cookie_behavior";
 
+// The GUID of the synced default search provider. Note that this acts like a
+// pointer to which synced search engine should be the default, rather than the
+// prefs below which describe the locally saved default search provider details
+// (and are not synced).

[Nicolas Zea, 2011/11/04 23:08:06]

Mention that this is ignored (and not affected by) the case of the default
search provider being managed.

[SteveT, 2011/11/07 21:48:56]

Done.

+const char kSyncedDefaultSearchProviderGUID[] =
+    "default_search_provider.synced_guid";
+
+const char kPendingSyncedDefaultSearchProviderChange[] =
+    "default_search_provider.pending_sync_change";
+
 // Whether having a default search provider is enabled.
 const char kDefaultSearchProviderEnabled[] =
     "default_search_provider.enabled";