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

chrome/browser/search_engines/template_url_service_factory.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/search_engines/template_url_service_factory.h"
 
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/pref_names.h"
@@ skipping 17 matching lines @@
 }
 
 TemplateURLServiceFactory::~TemplateURLServiceFactory() {}
 
 ProfileKeyedService* TemplateURLServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   return new TemplateURLService(profile);
 }
 
 void TemplateURLServiceFactory::RegisterUserPrefs(PrefService* prefs) {
+  prefs->RegisterStringPref(prefs::kSyncedDefaultSearchProviderGUID,
+                            std::string(),
+                            PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kDefaultSearchProviderEnabled,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kDefaultSearchProviderName,
                             std::string(),
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kDefaultSearchProviderID,
                             std::string(),
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kDefaultSearchProviderPrepopulateID,
@@ skipping 32 matching lines @@
   // TemplateURLService schedules a task on the WebDataService from its
   // destructor. Delete it first to ensure the task gets scheduled before we
   // shut down the database.
   ProfileKeyedServiceFactory::ProfileShutdown(profile);
   ProfileKeyedServiceFactory::ProfileDestroyed(profile);
 }
 
 void TemplateURLServiceFactory::ProfileDestroyed(Profile* profile) {
   // Don't double delete.
 }