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

chrome/browser/prefs/pref_set_observer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/pref_set_observer.h"
 
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_types.h"
 
 PrefSetObserver::PrefSetObserver(PrefService* pref_service,
@@ skipping 47 matching lines @@
     content::NotificationObserver* observer) {
   PrefSetObserver* pref_set = new PrefSetObserver(pref_service, observer);
   pref_set->AddPref(prefs::kDefaultSearchProviderEnabled);
   pref_set->AddPref(prefs::kDefaultSearchProviderName);
   pref_set->AddPref(prefs::kDefaultSearchProviderKeyword);
   pref_set->AddPref(prefs::kDefaultSearchProviderSearchURL);
   pref_set->AddPref(prefs::kDefaultSearchProviderSuggestURL);
   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;
 }
 
 void PrefSetObserver::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   if (observer_)
     observer_->Observe(type, source, details);
 }