Merge r1480 into the 149 line to fix some default search engines in ...

chrome/browser/template_url_prepopulate_data.cc

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 338 matching lines @@
   NULL,
   91,
 };
 
 const PrepopulatedEngine daum = {
   L"Daum",
   L"daum.net",
   L"http://search.daum.net/favicon.ico",
   L"http://search.daum.net/search?q={searchTerms}",
   "EUC-KR",
-  L"http://sug.search.daum.net/search_nsuggest?mod=fxjson&q={searchTerms}",
+  // Response is in EUC-KR and is labelled as such in HTTP C-T header.
+  // L"http://sug.search.daum.net/search_nsuggest?mod=fxjson&q={searchTerms}",
+  // Until http://b/1293145 is fixed or we figure out how to get responses
+  // in UTF-8, disable it. 
+  NULL,
   68,
 };
 
 const PrepopulatedEngine delfi_ee = {
   L"DELFI",
   L"delfi.ee",
   L"http://g.delfi.ee/s/search.png",
   L"http://otsing.delfi.ee/i.php?q={searchTerms}",
   "ISO-8859-1",
   NULL,
@@ skipping 29 matching lines @@
   NULL,
   60,
 };
 
 const PrepopulatedEngine empas = {
   L"\xc5e0\xd30c\xc2a4",
   L"empas.com",
   L"http://search.empas.com/favicon.ico",
   L"http://search.empas.com/search/all.html?q={searchTerms}",
   "EUC-KR",
+  // http://www.empas.com/ac/do.tsp?q={searchTerms}
+  // returns non-Firefox JSON.  searchTerms needs to be in Java notation
+  // (\uAC00\uAC01).
   NULL,
   70,
 };
 
 const PrepopulatedEngine eniro_dk = {
   L"Eniro",
   L"eniro.dk",
   L"http://eniro.dk/favicon.ico",
   L"http://eniro.dk/query?search_word={searchTerms}&what=web_local",
   "ISO-8859-1",
@@ skipping 488 matching lines @@
   NULL,
   88,
 };
 
 const PrepopulatedEngine meta = {
   L"<META>",
   L"meta.ua",
   L"http://meta.ua/favicon.ico",
   L"http://meta.ua/search.asp?q={searchTerms}",
   "windows-1251",
-  L"http://meta.ua/suggestions/?output=fxjson&q={searchTerms}",
+  L"http://meta.ua/suggestions/?output=fxjson&oe=utf-8&q={searchTerms}",
   102,
 };
 
 const PrepopulatedEngine msn = {
   L"MSN",
   L"msn.com",
   L"http://search.msn.com/s/wlflag.ico",
   L"http://search.msn.com/results.aspx?q={searchTerms}",
   "UTF-8",
   NULL,
@@ skipping 420 matching lines @@
   L"http://nate.search.empas.com/search/all.html?q={searchTerms}",
   "EUC-KR",
   NULL,
   69,
 };
 
 const PrepopulatedEngine naver = {
   L"\xb124\xc774\xbc84",
   L"naver.com",
   L"http://search.naver.com/favicon.ico",
-  L"http://search.naver.com/search.naver?query={searchTerms}",
-  "EUC-KR",
-  L"http://ac.search.naver.com/autocompl?m=s&ie={inputEncoding}&"
+  L"http://search.naver.com/search.naver?ie={inputEncoding}"
+      L"&query={searchTerms}",
+  "UTF-8",
+  L"http://ac.search.naver.com/autocompl?m=s&ie={inputEncoding}&oe=utf-8&"
       L"q={searchTerms}",
   67,
 };
 
 const PrepopulatedEngine neti = {
   L"NETI",
   L"neti.ee",
   L"http://www.neti.ee/favicon.ico",
   L"http://www.neti.ee/cgi-bin/otsing?query={searchTerms}",
   "ISO-8859-1",
@@ skipping 436 matching lines @@
 const PrepopulatedEngine yahoo = {
   L"Yahoo!",
   L"yahoo.com",
   L"http://search.yahoo.com/favicon.ico",
   L"http://search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
   L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
   2,
 };
 
+// For regional Yahoo variants without region-specific suggestion service,
+// suggestion is disabled. For some of them, we might consider
+// using a fallback (e.g. de for at/ch, ca or fr for qc, en for nl, no, hk).
 const PrepopulatedEngine yahoo_ar = {
   L"Yahoo! Argentina",
   L"ar.yahoo.com",
   L"http://ar.search.yahoo.com/favicon.ico",
   L"http://ar.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://ar-sayt.ff.search.yahoo.com/gossip-ar-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_at = {
   L"Yahoo! Suche",
   L"at.yahoo.com",
   L"http://at.search.yahoo.com/favicon.ico",
   L"http://at.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_au = {
   L"Yahoo!7",
   L"au.yahoo.com",
   L"http://au.search.yahoo.com/favicon.ico",
   L"http://au.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://aue-sayt.ff.search.yahoo.com/gossip-au-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_br = {
   L"Yahoo! Brasil",
   L"br.yahoo.com",
   L"http://br.search.yahoo.com/favicon.ico",
   L"http://br.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://br-sayt.ff.search.yahoo.com/gossip-br-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_ca = {
   L"Yahoo! Canada",
   L"ca.yahoo.com",
   L"http://ca.search.yahoo.com/favicon.ico",
   L"http://ca.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://gossip.ca.yahoo.com/gossip-ca-sayt?output=fxjsonp&"
+      L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_ch = {
   L"Yahoo! Suche",
   L"ch.yahoo.com",
   L"http://ch.search.yahoo.com/favicon.ico",
   L"http://ch.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_cl = {
   L"Yahoo! Chile",
   L"cl.yahoo.com",
   L"http://cl.search.yahoo.com/favicon.ico",
   L"http://cl.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+      L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_cn = {
   L"\x4e2d\x56fd\x96c5\x864e",
   L"cn.yahoo.com",
   L"http://search.cn.yahoo.com/favicon.ico",
   L"http://search.cn.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "GB2312",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  // http://cn.yahoo.com/cnsuggestion/suggestion.inc.php?of=fxjson&query=
+  // returns in a proprietary format ('|' delimeted word list).
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_co = {
   L"Yahoo! Colombia",
   L"co.yahoo.com",
   L"http://co.search.yahoo.com/favicon.ico",
   L"http://co.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+      L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_de = {
   L"Yahoo! Deutschland",
   L"de.yahoo.com",
   L"http://de.search.yahoo.com/favicon.ico",
   L"http://de.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://de-sayt.ff.search.yahoo.com/gossip-de-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_dk = {
   L"Yahoo! Danmark",
   L"dk.yahoo.com",
   L"http://dk.search.yahoo.com/favicon.ico",
   L"http://dk.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_es = {
   L"Yahoo! Espa" L"\x00f1" L"a",
   L"es.yahoo.com",
   L"http://es.search.yahoo.com/favicon.ico",
   L"http://es.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://es-sayt.ff.search.yahoo.com/gossip-es-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_fi = {
   L"Yahoo!-haku",
   L"fi.yahoo.com",
   L"http://fi.search.yahoo.com/favicon.ico",
   L"http://fi.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_fr = {
   L"Yahoo! France",
   L"fr.yahoo.com",
   L"http://fr.search.yahoo.com/favicon.ico",
   L"http://fr.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://fr-sayt.ff.search.yahoo.com/gossip-fr-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_hk = {
   L"Yahoo! Hong Kong",
   L"hk.yahoo.com",
   L"http://hk.search.yahoo.com/favicon.ico",
   L"http://hk.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  // http://history.hk.search.yahoo.com/ac/ac_msearch.php?query={searchTerms}
+  // returns a JSON with key-value pairs. Setting parameters (ot, of, output)
+  // to fxjson,json, or js doesn't help. 
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_id = {
   L"Yahoo! Indonesia",
   L"id.yahoo.com",
   L"http://id.search.yahoo.com/favicon.ico",
   L"http://id.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://id-sayt.ff.search.yahoo.com/gossip-id-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_in = {
   L"Yahoo! India",
   L"in.yahoo.com",
   L"http://in.search.yahoo.com/favicon.ico",
   L"http://in.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://in-sayt.ff.search.yahoo.com/gossip-in-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_it = {
   L"Yahoo! Italia",
   L"it.yahoo.com",
   L"http://it.search.yahoo.com/favicon.ico",
   L"http://it.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://it-sayt.ff.search.yahoo.com/gossip-it-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_jp = {
   L"Yahoo! JAPAN",
   L"yahoo.co.jp",
   L"http://search.yahoo.co.jp/favicon.ico",
   L"http://search.yahoo.co.jp/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_kr = {
   L"\xc57c\xd6c4! \xcf54\xb9ac\xc544",
   L"kr.yahoo.com",
   L"http://kr.search.yahoo.com/favicon.ico",
   L"http://kr.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://kr.atc.search.yahoo.com/atcx.php?property=main&ot=fxjson"
+     L"&ei=utf8&eo=utf8&command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_malaysia = {
   L"Yahoo! Malaysia",
   L"malaysia.yahoo.com",
   L"http://malaysia.search.yahoo.com/favicon.ico",
   L"http://malaysia.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
 
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://my-sayt.ff.search.yahoo.com/gossip-my-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_mx = {
   L"Yahoo! M\x00e9xico",
   L"mx.yahoo.com",
   L"http://mx.search.yahoo.com/favicon.ico",
   L"http://mx.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://gossip.mx.yahoo.com/gossip-mx-sayt?output=fxjsonp&"
+      L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_nl = {
   L"Yahoo! Nederland",
   L"nl.yahoo.com",
   L"http://nl.search.yahoo.com/favicon.ico",
   L"http://nl.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_no = {
   L"Yahoo! Norge",
   L"no.yahoo.com",
   L"http://no.search.yahoo.com/favicon.ico",
   L"http://no.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_nz = {
   L"Yahoo!Xtra",
   L"nz.yahoo.com",
-  L"http://sg.search.yahoo.com/favicon.ico",
-  L"http://sg.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
+  L"http://nz.search.yahoo.com/favicon.ico",
+  L"http://nz.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://aue-sayt.ff.search.yahoo.com/gossip-nz-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_pe = {
   L"Yahoo! Per\x00fa",
   L"pe.yahoo.com",
   L"http://pe.search.yahoo.com/favicon.ico",
   L"http://pe.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+      L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_ph = {
   L"Yahoo! Philippines",
   L"ph.yahoo.com",
   L"http://ph.search.yahoo.com/favicon.ico",
   L"http://ph.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://ph-sayt.ff.search.yahoo.com/gossip-ph-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_qc = {
   L"Yahoo! Qu" L"\x00e9" L"bec",
   L"qc.yahoo.com",
   L"http://qc.search.yahoo.com/favicon.ico",
   L"http://qc.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   5,  // Can't be 2 as this has to appear in the Canada list alongside yahoo_ca.
 };
 
 const PrepopulatedEngine yahoo_ru = {
   L"Yahoo! \x043f\x043e-\x0440\x0443\x0441\x0441\x043a\x0438",
   L"ru.yahoo.com",
   L"http://ru.search.yahoo.com/favicon.ico",
   L"http://ru.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_sg = {
   L"Yahoo! Singapore",
   L"sg.yahoo.com",
-  L"http://tw.search.yahoo.com/favicon.ico",
-  L"http://tw.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
+  L"http://sg.search.yahoo.com/favicon.ico",
+  L"http://sg.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://sg-sayt.ff.search.yahoo.com/gossip-sg-sayt?output=fxjson&"
+      L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_th = {
   L"Yahoo! \x0e1b\x0e23\x0e30\x0e40\x0e17\x0e28\x0e44\x0e17\x0e22",
   L"th.yahoo.com",
   L"http://th.search.yahoo.com/favicon.ico",
   L"http://th.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://th-sayt.ff.search.yahoo.com/gossip-th-sayt?output=fxjson&"
+    L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_tw = {
   L"Yahoo!\x5947\x6469",
   L"tw.yahoo.com",
   L"http://tw.search.yahoo.com/favicon.ico",
   L"http://tw.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  // "http://tw.yahoo.com/ac/ac_search.php?eo=utf8&of=js&prop=web&query="
+  // returns a JSON file prepended with 'fxjson={'.
+  NULL,
   2,
 };
 
 const PrepopulatedEngine yahoo_uk = {
   L"Yahoo! UK & Ireland",
   L"uk.yahoo.com",
   L"http://uk.search.yahoo.com/favicon.ico",
   L"http://uk.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://uk-sayt.ff.search.yahoo.com/gossip-uk-sayt?command={searchTerms}&"
+      L"queryfirst=2&output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yahoo_ve = {
   L"Yahoo! Venezuela",
   L"ve.yahoo.com",
   L"http://ve.search.yahoo.com/favicon.ico",
   L"http://ve.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+      L"command={searchTerms}",
   2,
 };
 
 const PrepopulatedEngine yahoo_vn = {
   L"Yahoo! Vi\x1ec7t Nam",
   L"vn.yahoo.com",
   L"http://vn.search.yahoo.com/favicon.ico",
   L"http://vn.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
   "UTF-8",
-  L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+  L"http://vn-sayt.ff.search.yahoo.com/gossip-vn-sayt?command={searchTerms}&"
+      L"output=fxjson",
   2,
 };
 
 const PrepopulatedEngine yam = {
   L"\u5929\u7a7a",
   L"yam.com",
   L"http://www.yam.com/i/8/sky.ico",
   L"http://search.yam.com/wps?k={searchTerms}",
   "Big5",
   NULL,
@@ skipping 808 matching lines @@
 
 }  // namespace
 
 namespace TemplateURLPrepopulateData {
 
 void RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall, -1);
 }
 
 int GetDataVersion() {
-  return 12;  // Increment this if you change the above data in ways that mean
+  return 13;  // Increment this if you change the above data in ways that mean
               // users with existing data should get a new version.
 }
 
 void GetPrepopulatedEngines(PrefService* prefs,
                             std::vector<TemplateURL*>* t_urls,
                             size_t* default_search_provider_index) {
   // TODO(pkasting): http://b/1225464 GeoID is not available on Win2k.  We'll
   // need to do something else there.
   const PrepopulatedEngine* engines;
   size_t num_engines;
@@ skipping 17 matching lines @@
     new_turl->set_date_created(Time());
     std::vector<std::string> turl_encodings;
     turl_encodings.push_back(engines[i].encoding);
     new_turl->set_input_encodings(turl_encodings);
     new_turl->set_prepopulate_id(engines[i].id);
     t_urls->push_back(new_turl);
   }
 }
 
 }  // namespace TemplateURLPrepopulateData