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

chrome/browser/search_engines/template_url_prepopulate_data.cc

 // Copyright (c) 2012 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_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 1192 matching lines @@
     for (size_t i = 0; i < engine.alternate_urls_size; ++i)
       alternate_urls.AppendString(std::string(engine.alternate_urls[i]));
   }
 
   return MakePrepopulatedTemplateURL(profile, WideToUTF16(engine.name),
       WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,
       engine.instant_url, engine.favicon_url, engine.encoding, alternate_urls,
       engine.search_terms_replacement_key, engine.id);
 }
 
+TemplateURL* MakeTemplateURLFromPrepopulateId(Profile* profile,
+                                              int prepopulate_id) {
+  const PrepopulatedEngine* engine =
+      GetPrepopulatedEngineFromID(prepopulate_id);
+  if (engine == NULL)

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

Nit: Or:

return engine ? MakePrepopulatedTemplateURLFromPrepopulateEngine(profile,
*engine) : NULL;

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

Function gone.

+    return NULL;
+  return MakePrepopulatedTemplateURLFromPrepopulateEngine(profile, *engine);
+}
+
 void GetPrepopulatedEngines(Profile* profile,
                             std::vector<TemplateURL*>* t_urls,
                             size_t* default_search_provider_index) {
   // If there is a set of search engines in the preferences file, it overrides
   // the built-in set.
   *default_search_provider_index = 0;
   GetPrepopulatedTemplateFromPrefs(profile, t_urls);
   if (!t_urls->empty())
     return;
 
@@ skipping 64 matching lines @@
 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
   if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) {
     return GURL((size == LOGO_200_PERCENT) ?
                 google_logos.logo_200_percent_url :
                 google_logos.logo_100_percent_url);
   }
   return GURL();
 }
 
 }  // namespace TemplateURLPrepopulateData