Ensure post-sync TemplateURL of prepopulated engines use built-in version.

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index 084460ac463fa081306e328e6f9db18d601c9841..be087bfd86b8b37e2daefdc129202d68ad77c4ac 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -446,6 +446,13 @@ class TemplateURLService : public WebDataServiceConsumer,
                       const TemplateURL& new_values,
                       const SearchTermsData& old_search_terms_data);
 
+  // If the TemplateURL comes from a prepopulated URL available in the current
+  // country, update all its fields save for the keyword, short name and id so
+  // that they match the internal prepopulated URL. TemplateURLs not coming from
+  // a prepopulated URL are not modified.
+  static void UpdateTemplateURLIfPrepopulated(TemplateURL* existing_turl,
+                                              Profile* profile);
+
   // Returns the preferences we use.
   PrefService* GetPrefs();