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

chrome/browser/prefs/pref_set_observer.cc

Index: chrome/browser/prefs/pref_set_observer.cc
===================================================================
--- chrome/browser/prefs/pref_set_observer.cc	(revision 108653)
+++ chrome/browser/prefs/pref_set_observer.cc	(working copy)
@@ -65,6 +65,7 @@
   pref_set->AddPref(prefs::kDefaultSearchProviderIconURL);
   pref_set->AddPref(prefs::kDefaultSearchProviderInstantURL);
   pref_set->AddPref(prefs::kDefaultSearchProviderEncodings);
+  pref_set->AddPref(prefs::kSyncedDefaultSearchProviderGUID);

[SteveT, 2011/11/04 21:23:23]

I'm not 100% certain that grouping kSyncedDefault... with the rest of these
prefs is the best approach given it's not actually a (potentially) managed pref
like the rest of these. However, it IS a pref related to the default search
provider. Let me know if this seems fine or not.

 
   return pref_set;
 }