This patch ensures that whenever a sync operation in TemplateURLService adds or updates a TemplateURL corresponding to a prepopulated engine, the latest built-in version of the prepopulated engine data is used.
We also bump the the version number of prepopulated_engines.json to fix currently broken databases.
BUG=171350
Review URL: https://chromiumcodereview.appspot.com/12084076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180627 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/search_engines/util.h b/chrome/browser/search_engines/util.h
index 41a20df..432569f3 100644
--- a/chrome/browser/search_engines/util.h
+++ b/chrome/browser/search_engines/util.h
@@ -23,6 +23,11 @@
// none is set. |profile| may be NULL.
string16 GetDefaultSearchEngineName(Profile* profile);
+// Modifies |prepopulated_url| so that it contains user-modified fields from
+// |original_turl|. Both URLs must have the same prepopulate_id.
+void MergeIntoPrepopulatedEngineData(TemplateURLData* prepopulated_url,
+ const TemplateURL* original_turl);
+
// Processes the results of WebDataService::GetKeywords, combining it with
// prepopulated search providers to result in:
// * a set of template_urls (search providers). The caller owns the
