Introduces a search term extraction mechanism working for arbitrary search providers.

chrome/browser/search_engines/template_url_prepopulate_data.cc

Index: chrome/browser/search_engines/template_url_prepopulate_data.cc
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index 2acfab305541bc3e42e121edd3acf5c97495a804..7d8f0b44086809c379589ce5b40b1b7466af054b 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -54,6 +54,10 @@ struct PrepopulatedEngine {
                                   // suggestions.
   const char* const instant_url;  // If NULL, this engine does not support
                                   // instant.
+  // Comma separated list of URL patterns that can be used, in addition to

[dominich, 2012/09/12 22:23:12]

does any provider have more than one of these alternative urls?

[beaudoin, 2012/09/13 18:16:45]

If we want to support the various Google various corpuses we will need more than
one, for example: https://maps.google.com/maps?q={searchTerm}

Maybe supporting the {anything} keyword Peter suggested would solve that for
Google properties, but I think having multiple alternate urls is a small cost
that could help us in some cases.

[Peter Kasting, 2012/09/13 18:22:08]

We should definitely not claim that Google Maps Search is an alternate URL for
Google Search.  Those are two distinct engines IMO.

In any case, I'm uncomfortable with "comma separated list" (especially as commas
can occur in URLs) and we don't need this now anyway, so write the simplest
possible change that does what we want and we'll add more flexibility later when
it becomes important.

[dominich, 2012/09/13 18:30:30]

That's exactly what I was getting at. This is added complexity (and not
necessarily the best way of adding the feature) that isn't necessary. It's not
clear to me how we will end up supporting each corpus. For instance, I can
imagine having a specific image_url for image search, should other providers
support that, so drag-and-drop works. Or the same for maps so we can launch the
browser directly onto a map search from, say, an email client.

Either way, I'd call this the extended_instant_url.

[beaudoin, 2012/09/13 18:31:49]

Sounds good, reverting to a single alternate_url. I wasn't too happy with the
comma-separated list either. It would probably require fancier serialization,
maybe encoding the URLs somehow.

This may hint at a deeper problem, however: do we want to extract search
keywords on the user's default search engine or do we want to do it on any
search engine we know of? To me, this subtlety hides a deeper architectural
difference. If (a) then the current approach is the right one. If (b) then we
should probably care less about the specific search engine and more about a
catalog of extraction patterns.

[beaudoin, 2012/09/22 06:55:45]

After discussions, leaving to multiple alternate_urls_

+  // |search_url| and |instant_url|, to extract search terms from a URL.
+  // Can be NULL.
+  const char* const alternate_urls;
   // SEARCH_ENGINE_OTHER if there is no matching type.
   const SearchEngineType type;
   // Unique id for this prepopulate engine (corresponds to
@@ -97,6 +101,7 @@ const PrepopulatedEngine abcsok = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_ABCSOK,
   72,
 };
@@ -109,6 +114,7 @@ const PrepopulatedEngine altavista = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_ALTAVISTA,
   89,
 };
@@ -121,6 +127,7 @@ const PrepopulatedEngine altavista_ar = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_ALTAVISTA,
   89,
 };
@@ -133,6 +140,7 @@ const PrepopulatedEngine altavista_se = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_ALTAVISTA,
   89,
 };
@@ -145,6 +153,7 @@ const PrepopulatedEngine aol = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   35,
 };
@@ -157,6 +166,7 @@ const PrepopulatedEngine araby = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   12,
 };
@@ -169,6 +179,7 @@ const PrepopulatedEngine ask = {
   "UTF-8",
   "http://ss.ask.com/query?q={searchTerms}&li=ff",
   NULL,
+  NULL,
   SEARCH_ENGINE_ASK,
   4,
 };
@@ -181,6 +192,7 @@ const PrepopulatedEngine ask_de = {
   "UTF-8",
   "http://ss.de.ask.com/query?q={searchTerms}&li=ff",
   NULL,
+  NULL,
   SEARCH_ENGINE_ASK,
   4,
 };
@@ -193,6 +205,7 @@ const PrepopulatedEngine ask_es = {
   "UTF-8",
   "http://ss.es.ask.com/query?q={searchTerms}&li=ff",
   NULL,
+  NULL,
   SEARCH_ENGINE_ASK,
   4,
 };
@@ -205,6 +218,7 @@ const PrepopulatedEngine ask_it = {
   "UTF-8",
   "http://ss.it.ask.com/query?q={searchTerms}&li=ff",
   NULL,
+  NULL,
   SEARCH_ENGINE_ASK,
   4,
 };
@@ -217,6 +231,7 @@ const PrepopulatedEngine ask_nl = {
   "UTF-8",
   "http://ss.nl.ask.com/query?q={searchTerms}&li=ff",
   NULL,
+  NULL,
   SEARCH_ENGINE_ASK,
   4,
 };
@@ -229,6 +244,7 @@ const PrepopulatedEngine ask_uk = {
   "UTF-8",
   "http://ss.uk.ask.com/query?q={searchTerms}&li=ff",
   NULL,
+  NULL,
   SEARCH_ENGINE_ASK,
   4,
 };
@@ -241,6 +257,7 @@ const PrepopulatedEngine atlas_cz = {
   "windows-1250",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   27,
 };
@@ -253,6 +270,7 @@ const PrepopulatedEngine atlas_sk = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   27,
 };
@@ -265,6 +283,7 @@ const PrepopulatedEngine baidu = {
   "GB2312",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_BAIDU,
   21,
 };
@@ -277,6 +296,7 @@ const PrepopulatedEngine bing = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -289,6 +309,7 @@ const PrepopulatedEngine bing_ar_XA = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   7,  // Can't be 3 as this has to appear in the Arabian countries' lists
       // alongside bing_en_XA.
@@ -302,6 +323,7 @@ const PrepopulatedEngine bing_bg_BG = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -314,6 +336,7 @@ const PrepopulatedEngine bing_cs_CZ = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -326,6 +349,7 @@ const PrepopulatedEngine bing_da_DK = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -338,6 +362,7 @@ const PrepopulatedEngine bing_de_AT = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -350,6 +375,7 @@ const PrepopulatedEngine bing_de_CH = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -362,6 +388,7 @@ const PrepopulatedEngine bing_de_DE = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -374,6 +401,7 @@ const PrepopulatedEngine bing_el_GR = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -386,6 +414,7 @@ const PrepopulatedEngine bing_en_AU = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -398,6 +427,7 @@ const PrepopulatedEngine bing_en_CA = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -410,6 +440,7 @@ const PrepopulatedEngine bing_en_GB = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -422,6 +453,7 @@ const PrepopulatedEngine bing_en_ID = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -434,6 +466,7 @@ const PrepopulatedEngine bing_en_IE = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -446,6 +479,7 @@ const PrepopulatedEngine bing_en_IN = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -458,6 +492,7 @@ const PrepopulatedEngine bing_en_MY = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -470,6 +505,7 @@ const PrepopulatedEngine bing_en_NZ = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -482,6 +518,7 @@ const PrepopulatedEngine bing_en_PH = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -494,6 +531,7 @@ const PrepopulatedEngine bing_en_SG = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -506,6 +544,7 @@ const PrepopulatedEngine bing_en_US = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -518,6 +557,7 @@ const PrepopulatedEngine bing_en_XA = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -530,6 +570,7 @@ const PrepopulatedEngine bing_en_ZA = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -542,6 +583,7 @@ const PrepopulatedEngine bing_es_AR = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -554,6 +596,7 @@ const PrepopulatedEngine bing_es_CL = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -566,6 +609,7 @@ const PrepopulatedEngine bing_es_ES = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -578,6 +622,7 @@ const PrepopulatedEngine bing_es_MX = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -590,6 +635,7 @@ const PrepopulatedEngine bing_es_XL = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -602,6 +648,7 @@ const PrepopulatedEngine bing_et_EE = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -614,6 +661,7 @@ const PrepopulatedEngine bing_fi_FI = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -626,6 +674,7 @@ const PrepopulatedEngine bing_fr_BE = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   7,
 };
@@ -638,6 +687,7 @@ const PrepopulatedEngine bing_fr_CA = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   7,
 };
@@ -650,6 +700,7 @@ const PrepopulatedEngine bing_fr_CH = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   7,
 };
@@ -662,6 +713,7 @@ const PrepopulatedEngine bing_fr_FR = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -674,6 +726,7 @@ const PrepopulatedEngine bing_he_IL = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -686,6 +739,7 @@ const PrepopulatedEngine bing_hr_HR = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -698,6 +752,7 @@ const PrepopulatedEngine bing_hu_HU = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -710,6 +765,7 @@ const PrepopulatedEngine bing_it_IT = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -722,6 +778,7 @@ const PrepopulatedEngine bing_ja_JP = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -734,6 +791,7 @@ const PrepopulatedEngine bing_ko_KR = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -746,6 +804,7 @@ const PrepopulatedEngine bing_lt_LT = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -758,6 +817,7 @@ const PrepopulatedEngine bing_lv_LV = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -770,6 +830,7 @@ const PrepopulatedEngine bing_nb_NO = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -782,6 +843,7 @@ const PrepopulatedEngine bing_nl_BE = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -794,6 +856,7 @@ const PrepopulatedEngine bing_nl_NL = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -806,6 +869,7 @@ const PrepopulatedEngine bing_pl_PL = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -818,6 +882,7 @@ const PrepopulatedEngine bing_pt_BR = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -830,6 +895,7 @@ const PrepopulatedEngine bing_pt_PT = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -842,6 +908,7 @@ const PrepopulatedEngine bing_ro_RO = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -854,6 +921,7 @@ const PrepopulatedEngine bing_ru_RU = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -866,6 +934,7 @@ const PrepopulatedEngine bing_sl_SI = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -878,6 +947,7 @@ const PrepopulatedEngine bing_sk_SK = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -890,6 +960,7 @@ const PrepopulatedEngine bing_sv_SE = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -902,6 +973,7 @@ const PrepopulatedEngine bing_th_TH = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -914,6 +986,7 @@ const PrepopulatedEngine bing_tr_TR = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -926,6 +999,7 @@ const PrepopulatedEngine bing_uk_UA = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -938,6 +1012,7 @@ const PrepopulatedEngine bing_zh_CN = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -950,6 +1025,7 @@ const PrepopulatedEngine bing_zh_HK = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -962,6 +1038,7 @@ const PrepopulatedEngine bing_zh_TW = {
   "UTF-8",
   "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
   NULL,
+  NULL,
   SEARCH_ENGINE_BING,
   3,
 };
@@ -974,6 +1051,7 @@ const PrepopulatedEngine centrum_cz = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_CENTRUM,
   26,
 };
@@ -986,6 +1064,7 @@ const PrepopulatedEngine centrum_sk = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_CENTRUM,
   26,
 };
@@ -998,6 +1077,7 @@ const PrepopulatedEngine daum = {
   "EUC-KR",
   "http://sug.search.daum.net/search_nsuggest?mod=fxjson&q={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_DAUM,
   68,
 };
@@ -1010,6 +1090,7 @@ const PrepopulatedEngine delfi_lt = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_DELFI,
   45,
 };
@@ -1022,6 +1103,7 @@ const PrepopulatedEngine delfi_lv = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_DELFI,
   45,
 };
@@ -1034,6 +1116,7 @@ const PrepopulatedEngine diri = {
   "windows-1251",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_DIRI,
   32,
 };
@@ -1046,6 +1129,7 @@ const PrepopulatedEngine eniro_fi = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   29,
 };
@@ -1058,6 +1142,7 @@ const PrepopulatedEngine eniro_se = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   29,
 };
@@ -1070,6 +1155,7 @@ const PrepopulatedEngine fonecta_02_fi = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   46,
 };
@@ -1082,6 +1168,7 @@ const PrepopulatedEngine goo = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_GOO,
   23,
 };
@@ -1099,6 +1186,7 @@ const PrepopulatedEngine google = {
       "client=chrome&hl={language}&q={searchTerms}",
   "{google:baseURL}webhp?sourceid=chrome-instant&{google:RLZ}"
       "{google:instantEnabledParameter}ie={inputEncoding}",
+  "{google:baseURL}/#q={searchTerms}",
   SEARCH_ENGINE_GOOGLE,
   1,
 };
@@ -1111,6 +1199,7 @@ const PrepopulatedEngine guruji = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   38,
 };
@@ -1123,6 +1212,7 @@ const PrepopulatedEngine hispavista = {
   "iso-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   18,
 };
@@ -1135,6 +1225,7 @@ const PrepopulatedEngine in = {
   "ISO-8859-7",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_IN,
   54,
 };
@@ -1147,6 +1238,7 @@ const PrepopulatedEngine jabse = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   19,
 };
@@ -1159,6 +1251,7 @@ const PrepopulatedEngine jubii = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   28,
 };
@@ -1171,6 +1264,7 @@ const PrepopulatedEngine kvasir = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   73,
 };
@@ -1183,6 +1277,7 @@ const PrepopulatedEngine latne = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   71,
 };
@@ -1195,6 +1290,7 @@ const PrepopulatedEngine leit = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   59,
 };
@@ -1207,6 +1303,7 @@ const PrepopulatedEngine libero = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   63,
 };
@@ -1219,6 +1316,7 @@ const PrepopulatedEngine mail_ru = {
   "windows-1251",
   "http://suggests.go.mail.ru/chrome?q={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_MAILRU,
   83,
 };
@@ -1231,6 +1329,7 @@ const PrepopulatedEngine maktoob = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   13,
 };
@@ -1243,6 +1342,7 @@ const PrepopulatedEngine masrawy = {
   "windows-1256",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   14,
 };
@@ -1255,6 +1355,7 @@ const PrepopulatedEngine mynet = {
   "windows-1254",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   101,
 };
@@ -1267,6 +1368,7 @@ const PrepopulatedEngine najdi = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_NAJDI,
   87,
 };
@@ -1279,6 +1381,7 @@ const PrepopulatedEngine nate = {
   "EUC-KR",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   69,
 };
@@ -1292,6 +1395,7 @@ const PrepopulatedEngine naver = {
   "http://ac.search.naver.com/autocompl?m=s&ie={inputEncoding}&oe=utf-8&"
       "q={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_NAVER,
   67,
 };
@@ -1304,6 +1408,7 @@ const PrepopulatedEngine neti = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_NETI,
   44,
 };
@@ -1316,6 +1421,7 @@ const PrepopulatedEngine netsprint = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_NETSPRINT,
   30,
 };
@@ -1328,6 +1434,7 @@ const PrepopulatedEngine nur_kz = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   20,
 };
@@ -1340,6 +1447,7 @@ const PrepopulatedEngine ok = {
   "ISO-8859-2",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OK,
   6,
 };
@@ -1352,6 +1460,7 @@ const PrepopulatedEngine onet = {
   "ISO-8859-2",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   75,
 };
@@ -1364,6 +1473,7 @@ const PrepopulatedEngine pogodak_rs = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_POGODAK,
   24,
 };
@@ -1376,6 +1486,7 @@ const PrepopulatedEngine rambler = {
   "windows-1251",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_RAMBLER,
   16,
 };
@@ -1388,6 +1499,7 @@ const PrepopulatedEngine rediff = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   37,
 };
@@ -1400,6 +1512,7 @@ const PrepopulatedEngine rednano = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   41,
 };
@@ -1412,6 +1525,7 @@ const PrepopulatedEngine sanook = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_SANOOK,
   100,
 };
@@ -1424,6 +1538,7 @@ const PrepopulatedEngine sapo = {
   "UTF-8",
   "http://pesquisa.sapo.pt/livesapo?q={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_SAPO,
   77,
 };
@@ -1436,6 +1551,7 @@ const PrepopulatedEngine search_de_CH = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   51,
 };
@@ -1448,6 +1564,7 @@ const PrepopulatedEngine search_fr_CH = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   22,
 };
@@ -1461,6 +1578,7 @@ const PrepopulatedEngine seznam = {
   "http:///suggest.fulltext.seznam.cz/?dict=fulltext_ff&phrase={searchTerms}&"
       "encoding={inputEncoding}&response_encoding=utf-8",
   NULL,
+  NULL,
   SEARCH_ENGINE_SEZNAM,
   25,
 };
@@ -1473,6 +1591,7 @@ const PrepopulatedEngine terra_ar = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   90,
 };
@@ -1485,6 +1604,7 @@ const PrepopulatedEngine terra_es = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   90,
 };
@@ -1497,6 +1617,7 @@ const PrepopulatedEngine tut = {
   "windows-1251",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_TUT,
   17,
 };
@@ -1509,6 +1630,7 @@ const PrepopulatedEngine uol = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   82,
 };
@@ -1521,6 +1643,7 @@ const PrepopulatedEngine virgilio = {
   "ISO-8859-1",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_VIRGILIO,
   62,
 };
@@ -1533,6 +1656,7 @@ const PrepopulatedEngine walla = {
   "windows-1255",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_WALLA,
   55,
 };
@@ -1545,6 +1669,7 @@ const PrepopulatedEngine wp = {
   "ISO-8859-2",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   76,
 };
@@ -1557,6 +1682,7 @@ const PrepopulatedEngine yahoo = {
   "UTF-8",
   "http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1574,6 +1700,7 @@ const PrepopulatedEngine yahoo_ar = {
   "http://ar-sayt.ff.search.yahoo.com/gossip-ar-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1587,6 +1714,7 @@ const PrepopulatedEngine yahoo_at = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1601,6 +1729,7 @@ const PrepopulatedEngine yahoo_au = {
   "http://aue-sayt.ff.search.yahoo.com/gossip-au-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1615,6 +1744,7 @@ const PrepopulatedEngine yahoo_br = {
   "http://br-sayt.ff.search.yahoo.com/gossip-br-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1629,6 +1759,7 @@ const PrepopulatedEngine yahoo_ca = {
   "http://gossip.ca.yahoo.com/gossip-ca-sayt?output=fxjsonp&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1642,6 +1773,7 @@ const PrepopulatedEngine yahoo_ch = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1656,6 +1788,7 @@ const PrepopulatedEngine yahoo_cl = {
   "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1669,6 +1802,7 @@ const PrepopulatedEngine yahoo_cn = {
   "GB2312",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1683,6 +1817,7 @@ const PrepopulatedEngine yahoo_co = {
   "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1697,6 +1832,7 @@ const PrepopulatedEngine yahoo_de = {
   "http://de-sayt.ff.search.yahoo.com/gossip-de-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1710,6 +1846,7 @@ const PrepopulatedEngine yahoo_dk = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1724,6 +1861,7 @@ const PrepopulatedEngine yahoo_es = {
   "http://es-sayt.ff.search.yahoo.com/gossip-es-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1737,6 +1875,7 @@ const PrepopulatedEngine yahoo_fi = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1751,6 +1890,7 @@ const PrepopulatedEngine yahoo_fr = {
   "http://fr-sayt.ff.search.yahoo.com/gossip-fr-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1764,6 +1904,7 @@ const PrepopulatedEngine yahoo_hk = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1778,6 +1919,7 @@ const PrepopulatedEngine yahoo_id = {
   "http://id-sayt.ff.search.yahoo.com/gossip-id-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1792,6 +1934,7 @@ const PrepopulatedEngine yahoo_in = {
   "http://in-sayt.ff.search.yahoo.com/gossip-in-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1806,6 +1949,7 @@ const PrepopulatedEngine yahoo_it = {
   "http://it-sayt.ff.search.yahoo.com/gossip-it-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1819,6 +1963,7 @@ const PrepopulatedEngine yahoo_jp = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOOJP,
   2,
 };
@@ -1833,6 +1978,7 @@ const PrepopulatedEngine yahoo_kr = {
   "http://kr.atc.search.yahoo.com/atcx.php?property=main&ot=fxjson&"
      "ei=utf8&eo=utf8&command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1847,6 +1993,7 @@ const PrepopulatedEngine yahoo_malaysia = {
   "http://my-sayt.ff.search.yahoo.com/gossip-my-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1861,6 +2008,7 @@ const PrepopulatedEngine yahoo_mx = {
   "http://gossip.mx.yahoo.com/gossip-mx-sayt?output=fxjsonp&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1874,6 +2022,7 @@ const PrepopulatedEngine yahoo_nl = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1887,6 +2036,7 @@ const PrepopulatedEngine yahoo_no = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1901,6 +2051,7 @@ const PrepopulatedEngine yahoo_nz = {
   "http://aue-sayt.ff.search.yahoo.com/gossip-nz-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1915,6 +2066,7 @@ const PrepopulatedEngine yahoo_pe = {
   "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1929,6 +2081,7 @@ const PrepopulatedEngine yahoo_ph = {
   "http://ph-sayt.ff.search.yahoo.com/gossip-ph-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1942,6 +2095,7 @@ const PrepopulatedEngine yahoo_qc = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOOQC,
   5,  // Can't be 2 as this has to appear in the Canada list alongside yahoo_ca.
 };
@@ -1955,6 +2109,7 @@ const PrepopulatedEngine yahoo_ru = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1968,6 +2123,7 @@ const PrepopulatedEngine yahoo_se = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1982,6 +2138,7 @@ const PrepopulatedEngine yahoo_sg = {
   "http://sg-sayt.ff.search.yahoo.com/gossip-sg-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -1996,6 +2153,7 @@ const PrepopulatedEngine yahoo_th = {
   "http://th-sayt.ff.search.yahoo.com/gossip-th-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -2009,6 +2167,7 @@ const PrepopulatedEngine yahoo_tw = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -2023,6 +2182,7 @@ const PrepopulatedEngine yahoo_uk = {
   "http://uk-sayt.ff.search.yahoo.com/gossip-uk-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -2037,6 +2197,7 @@ const PrepopulatedEngine yahoo_ve = {
   "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -2051,6 +2212,7 @@ const PrepopulatedEngine yahoo_vn = {
   "http://vn-sayt.ff.search.yahoo.com/gossip-vn-sayt?output=fxjson&"
       "command={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YAHOO,
   2,
 };
@@ -2063,6 +2225,7 @@ const PrepopulatedEngine yamli = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_OTHER,
   11,
 };
@@ -2075,6 +2238,7 @@ const PrepopulatedEngine yandex_ru = {
   "UTF-8",
   "http://suggest.yandex.net/suggest-ff.cgi?part={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YANDEX,
   15,
 };
@@ -2087,6 +2251,7 @@ const PrepopulatedEngine yandex_ua = {
   "UTF-8",
   "http://suggest.yandex.net/suggest-ff.cgi?part={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YANDEX,
   15,
 };
@@ -2099,6 +2264,7 @@ const PrepopulatedEngine zoznam = {
   "windows-1250",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_ZOZNAM,
   85,
 };
@@ -2117,6 +2283,7 @@ const PrepopulatedEngine all_by = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_ALL_BY,
   33,
 };
@@ -2129,6 +2296,7 @@ const PrepopulatedEngine aport = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_APORT,
   34,
 };
@@ -2141,6 +2309,7 @@ const PrepopulatedEngine avg = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_AVG,
   50,
 };
@@ -2153,6 +2322,7 @@ const PrepopulatedEngine avg_i = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_AVG,
   52,
 };
@@ -2165,6 +2335,7 @@ const PrepopulatedEngine conduit = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_CONDUIT,
   36,
 };
@@ -2177,6 +2348,7 @@ const PrepopulatedEngine icq = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_ICQ,
   39,
 };
@@ -2189,6 +2361,7 @@ const PrepopulatedEngine meta_ua = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_META_UA,
   40,
 };
@@ -2201,6 +2374,7 @@ const PrepopulatedEngine metabot_ru = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_METABOT_RU,
   42,
 };
@@ -2213,6 +2387,7 @@ const PrepopulatedEngine nigma = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_NIGMA,
   43,
 };
@@ -2225,6 +2400,7 @@ const PrepopulatedEngine qip = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_QIP,
   47,
 };
@@ -2237,6 +2413,7 @@ const PrepopulatedEngine ukr_net = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_UKR_NET,
   48,
 };
@@ -2249,6 +2426,7 @@ const PrepopulatedEngine webalta = {
   "UTF-8",
   NULL,
   NULL,
+  NULL,
   SEARCH_ENGINE_WEBALTA,
   49,
 };
@@ -2261,6 +2439,7 @@ const PrepopulatedEngine yandex_tr = {
   "UTF-8",
   "http://suggest.yandex.net/suggest-ff.cgi?part={searchTerms}",
   NULL,
+  NULL,
   SEARCH_ENGINE_YANDEX,
   15,
 };
@@ -3327,28 +3506,31 @@ void RegisterUserPrefs(PrefService* prefs) {
 int GetDataVersion(PrefService* prefs) {
   // Increment this if you change the above data in ways that mean users with
   // existing data should get a new version.
-  const int kCurrentDataVersion = 41;
+  const int kCurrentDataVersion = 42;
   // Allow tests to override the local version.
   return (prefs && prefs->HasPrefPath(prefs::kSearchProviderOverridesVersion)) ?
       prefs->GetInteger(prefs::kSearchProviderOverridesVersion) :
       kCurrentDataVersion;
 }
 
-TemplateURL* MakePrepopulatedTemplateURL(Profile* profile,
-                                         const string16& name,
-                                         const string16& keyword,
-                                         const base::StringPiece& search_url,
-                                         const base::StringPiece& suggest_url,
-                                         const base::StringPiece& instant_url,
-                                         const base::StringPiece& favicon_url,
-                                         const base::StringPiece& encoding,
-                                         int id) {
+TemplateURL* MakePrepopulatedTemplateURL(
+    Profile* profile,
+    const string16& name,
+    const string16& keyword,
+    const base::StringPiece& search_url,
+    const base::StringPiece& suggest_url,
+    const base::StringPiece& instant_url,
+    const base::StringPiece& alternate_urls,
+    const base::StringPiece& favicon_url,
+    const base::StringPiece& encoding,
+    int id) {
   TemplateURLData data;
   data.short_name = name;
   data.SetKeyword(keyword);
   data.SetURL(search_url.as_string());
   data.suggestions_url = suggest_url.as_string();
   data.instant_url = instant_url.as_string();
+  data.DeserializeAndSetAlternateURLs(alternate_urls.as_string());
   data.favicon_url = GURL(favicon_url.as_string());
   data.show_in_default_list = true;
   data.safe_for_autoreplace = true;
@@ -3374,6 +3556,7 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
   std::string search_url;
   std::string suggest_url;
   std::string instant_url;
+  std::string alternate_urls;
   std::string favicon_url;
   std::string encoding;
   int id;
@@ -3387,6 +3570,7 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
         engine->GetString("search_url", &search_url) &&
         engine->GetString("suggest_url", &suggest_url) &&
         engine->GetString("instant_url", &instant_url) &&
+        engine->GetString("alternate_urls", &alternate_urls) &&
         engine->GetString("favicon_url", &favicon_url) &&
         engine->GetString("encoding", &encoding) &&
         engine->GetInteger("id", &id)) {
@@ -3399,7 +3583,8 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
       continue;
     }
     t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword,
-        search_url, suggest_url, instant_url, favicon_url, encoding, id));
+        search_url, suggest_url, instant_url, alternate_urls, favicon_url,
+        encoding, id));
   }
 }
 
@@ -3409,7 +3594,8 @@ TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
     const PrepopulatedEngine& engine) {
   return MakePrepopulatedTemplateURL(profile, WideToUTF16(engine.name),
       WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,
-      engine.instant_url, engine.favicon_url, engine.encoding, engine.id);
+      engine.instant_url, engine.alternate_urls, engine.favicon_url,
+      engine.encoding, engine.id);
 }
 
 void GetPrepopulatedEngines(Profile* profile,