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..7867a0de985b0b575cff7a1c97a6c9c619317461 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -446,6 +446,12 @@ class TemplateURLService : public WebDataServiceConsumer,
                       const TemplateURL& new_values,
                       const SearchTermsData& old_search_terms_data);
 
+  // If the TemplateURL comes from a prepopulated URL, update all its fields
+  // save for the keyword, short name and id so that they match the internal
+  // prepopulated URL. TemplateURL not coming from a prepopulated URL are not

[Peter Kasting, 2013/01/30 22:32:33]

Nit: TemplateURLs

[beaudoin, 2013/02/01 21:12:38]

Done.

+  // modified.
+  void UpdatePrepopulatedTemplateURL(TemplateURL* existing_turl);

[Peter Kasting, 2013/01/30 22:32:33]

Nit: Seems like the function could be named better -- it implies that
|existing_turl| is a prepopulated TemplateURL.

There's also no commentary as to why we do this or what happens if we don't.

[beaudoin, 2013/02/01 21:12:38]

Done.

+
   // Returns the preferences we use.
   PrefService* GetPrefs();