Moving prepopulated search engines to a JSON file.

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
 
 #include "base/command_line.h"
-#include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#include "prepopulated_engines.h"

[not at google - send to devlin, 2012/11/12 18:38:13]

out of curiosity: why not chrome/browser/seatch_engines/prepopulated_engines.h?

[Peter Kasting, 2012/11/12 22:46:36]

Yeah, that's probably an error actually.

[beaudoin, 2012/11/13 18:44:26]

Because mistake! Thanks for catching it! :)

Done.

[beaudoin, 2012/11/13 18:44:26]

Done.

+
 #if defined(OS_WIN)
 #undef IN  // On Windows, windef.h defines this, which screws up "India" cases.
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
 #endif
 
-namespace {
+namespace TemplateURLPrepopulateData {
 
-// NOTE: See comments in GetDataVersion() below!  You should probably not change
-// the data in this file without changing the result of that function!
-
-// Engine definitions //////////////////////////////////////////////////////////
-
-struct PrepopulatedEngine {
-  const wchar_t* const name;
-  const wchar_t* const keyword;
-  const char* const favicon_url;  // If NULL, there is no favicon.
-  const char* const search_url;
-  const char* const encoding;
-  const char* const suggest_url;  // If NULL, this engine does not support
-                                  // suggestions.
-  const char* const instant_url;  // If NULL, this engine does not support
-                                  // instant.
-  // A JSON array containing a list of URL patterns that can be used, in
-  // addition to |search_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
-  // TemplateURL::prepopulate_id). This ID must be greater than zero and must
-  // remain the same for a particular site regardless of how the url changes;
-  // the ID is used when modifying engine data in subsequent versions, so that
-  // we can find the "old" entry to update even when the name or URL changes.
-  //
-  // This ID must be "unique" within one country's prepopulated data, but two
-  // entries can share an ID if they represent the "same" engine (e.g. Yahoo! US
-  // vs. Yahoo! UK) and will not appear in the same user-visible data set.  This
-  // facilitates changes like adding more specific per-country data in the
-  // future; in such a case the localized engines will transparently replace the
-  // previous, non-localized versions.  For engines where we need two instances
-  // to appear for one country (e.g. Bing Search U.S. English and Spanish), we
-  // must use two different unique IDs (and different keywords).
-  //
-  // The following unique IDs are available:
-  //    53, 56, 58, 60, 61, 64, 65, 66, 70, 74, 78, 79, 80, 81, 84, 86, 88, 91,
-  //    92, 93, 94, 95, 96, 97, 98, 99, 102+
-  //
-  // IDs > 1000 are reserved for distribution custom engines.
-  //
-  // NOTES:
-  //   CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad!
-  //   CHANGE kMaxPrepopulatedEngineID below if you add new engine outside
-  //       of the current range or it will not be counted in stats.
-  const int id;
-};
-
-// Prepopulated engines ////////////////////////////////////////////////////////
-
-// The following engines are included in country lists and are added to the list
-// of search engines on the first run depending on user's country.
-
-const PrepopulatedEngine abcsok = {
-  L"ABC S\x00f8k",
-  L"abcsok.no",
-  "http://abcsok.no/favicon.ico",
-  "http://abcsok.no/index.html?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ABCSOK,
-  72,
-};
-
-const PrepopulatedEngine altavista = {
-  L"AltaVista",
-  L"altavista.com",
-  "http://www.altavista.com/favicon.ico",
-  "http://www.altavista.com/web/results?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ALTAVISTA,
-  89,
-};
-
-const PrepopulatedEngine altavista_ar = {
-  L"AltaVista",
-  L"ar.altavista.com",
-  "http://ar.altavista.com/favicon.ico",
-  "http://ar.altavista.com/web/results?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ALTAVISTA,
-  89,
-};
-
-const PrepopulatedEngine altavista_se = {
-  L"AltaVista",
-  L"se.altavista.com",
-  "http://se.altavista.com/favicon.ico",
-  "http://se.altavista.com/web/results?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ALTAVISTA,
-  89,
-};
-
-const PrepopulatedEngine aol = {
-  L"AOL",
-  L"aol.com",
-  "http://search.aol.com/favicon.ico",
-  "http://search.aol.com/aol/search?query={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  35,
-};
-
-const PrepopulatedEngine araby = {
-  L"\x0639\x0631\x0628\x064a",
-  L"araby.com",
-  "http://araby.com/favicon.ico",
-  "http://araby.com/?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  12,
-};
-
-const PrepopulatedEngine ask = {
-  L"Ask",
-  L"ask.com",
-  "http://www.ask.com/favicon.ico",
-  "http://www.ask.com/web?q={searchTerms}",
-  "UTF-8",
-  "http://ss.ask.com/query?q={searchTerms}&li=ff",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ASK,
-  4,
-};
-
-const PrepopulatedEngine ask_de = {
-  L"Ask.com Deutschland",
-  L"de.ask.com",
-  "http://de.ask.com/favicon.ico",
-  "http://de.ask.com/web?q={searchTerms}",
-  "UTF-8",
-  "http://ss.de.ask.com/query?q={searchTerms}&li=ff",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ASK,
-  4,
-};
-
-const PrepopulatedEngine ask_es = {
-  L"Ask.com Espa" L"\x00f1" L"a",
-  L"es.ask.com",
-  "http://es.ask.com/favicon.ico",
-  "http://es.ask.com/web?q={searchTerms}",
-  "UTF-8",
-  "http://ss.es.ask.com/query?q={searchTerms}&li=ff",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ASK,
-  4,
-};
-
-const PrepopulatedEngine ask_it = {
-  L"Ask.com Italia",
-  L"it.ask.com",
-  "http://it.ask.com/favicon.ico",
-  "http://it.ask.com/web?q={searchTerms}",
-  "UTF-8",
-  "http://ss.it.ask.com/query?q={searchTerms}&li=ff",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ASK,
-  4,
-};
-
-const PrepopulatedEngine ask_nl = {
-  L"Ask.com Nederland",
-  L"nl.ask.com",
-  "http://nl.ask.com/favicon.ico",
-  "http://nl.ask.com/web?q={searchTerms}",
-  "UTF-8",
-  "http://ss.nl.ask.com/query?q={searchTerms}&li=ff",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ASK,
-  4,
-};
-
-const PrepopulatedEngine ask_uk = {
-  L"Ask Jeeves",
-  L"uk.ask.com",
-  "http://uk.ask.com/favicon.ico",
-  "http://uk.ask.com/web?q={searchTerms}",
-  "UTF-8",
-  "http://ss.uk.ask.com/query?q={searchTerms}&li=ff",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ASK,
-  4,
-};
-
-const PrepopulatedEngine atlas_cz = {
-  L"Atlas",
-  L"atlas.cz",
-  "http://img.atlas.cz/favicon.ico",
-  "http://search.atlas.cz/?q={searchTerms}",
-  "windows-1250",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  27,
-};
-
-const PrepopulatedEngine atlas_sk = {
-  L"ATLAS.SK",
-  L"atlas.sk",
-  "http://www.atlas.sk/images/favicon.ico",
-  "http://hladaj.atlas.sk/fulltext/?phrase={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  27,
-};
-
-const PrepopulatedEngine baidu = {
-  L"\x767e\x5ea6",
-  L"baidu.com",
-  "http://www.baidu.com/favicon.ico",
-  "http://www.baidu.com/s?wd={searchTerms}",
-  "GB2312",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BAIDU,
-  21,
-};
-
-const PrepopulatedEngine bing = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_ar_XA = {
-  L"Bing",
-  L"bing.com_",  // bing.com is taken by bing_en_XA.
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=ar-XA&q={searchTerms}",
-  "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.
-};
-
-const PrepopulatedEngine bing_bg_BG = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=bg-BG&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_cs_CZ = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=cs-CZ&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_da_DK = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=da-DK&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_de_AT = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=de-AT&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_de_CH = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=de-CH&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_de_DE = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=de-DE&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_el_GR = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=el-GR&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_AU = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-AU&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_CA = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-CA&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_GB = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-GB&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_ID = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-ID&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_IE = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-IE&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_IN = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-IN&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_MY = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-MY&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_NZ = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-NZ&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_PH = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-PH&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_SG = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-SG&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_US = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-US&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_XA = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-XA&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_en_ZA = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=en-ZA&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_es_AR = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=es-AR&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_es_CL = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=es-CL&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_es_ES = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=es-ES&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_es_MX = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=es-MX&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_es_XL = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=es-XL&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_et_EE = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=et-EE&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_fi_FI = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=fi-FI&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_fr_BE = {
-  L"Bing",
-  L"bing.com_",  // bing.com is taken by bing_nl_BE.
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=fr-BE&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  7,
-};
-
-const PrepopulatedEngine bing_fr_CA = {
-  L"Bing",
-  L"bing.com_",  // bing.com is taken by bing_en_CA.
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=fr-CA&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  7,
-};
-
-const PrepopulatedEngine bing_fr_CH = {
-  L"Bing",
-  L"bing.com_",  // bing.com is taken by bing_de_CH.
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=fr-CH&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  7,
-};
-
-const PrepopulatedEngine bing_fr_FR = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=fr-FR&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_he_IL = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=he-IL&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_hr_HR = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=hr-HR&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_hu_HU = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=hu-HU&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_it_IT = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=it-IT&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_ja_JP = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=ja-JP&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_ko_KR = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=ko-KR&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_lt_LT = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=lt-LT&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_lv_LV = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=lv-LV&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_nb_NO = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=nb-NO&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_nl_BE = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=nl-BE&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_nl_NL = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=nl-NL&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_pl_PL = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=pl-PL&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_pt_BR = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=pt-BR&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_pt_PT = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=pt-PT&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_ro_RO = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=ro-RO&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_ru_RU = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=ru-RU&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_sl_SI = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=sl-SI&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_sk_SK = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=sk-SK&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_sv_SE = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=sv-SE&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_th_TH = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=th-TH&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_tr_TR = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=tr-TR&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_uk_UA = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=uk-UA&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_zh_CN = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=zh-CN&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_zh_HK = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=zh-HK&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine bing_zh_TW = {
-  L"Bing",
-  L"bing.com",
-  "http://www.bing.com/s/wlflag.ico",
-  "http://www.bing.com/search?setmkt=zh-TW&q={searchTerms}",
-  "UTF-8",
-  "http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_BING,
-  3,
-};
-
-const PrepopulatedEngine centrum_cz = {
-  L"Centrum.cz",
-  L"centrum.cz",
-  "http://img.centrum.cz/6/vy2/o/favicon.ico",
-  "http://search.centrum.cz/index.php?charset={inputEncoding}&q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_CENTRUM,
-  26,
-};
-
-const PrepopulatedEngine centrum_sk = {
-  L"Centrum.sk",
-  L"centrum.sk",
-  "http://img.centrum.sk/4/favicon.ico",
-  "http://search.centrum.sk/index.php?charset={inputEncoding}&q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_CENTRUM,
-  26,
-};
-
-const PrepopulatedEngine daum = {
-  L"Daum",
-  L"daum.net",
-  "http://icon.daum-img.net/favicon.ico",
-  "http://search.daum.net/search?q={searchTerms}",
-  "UTF-8",
-  "http://sug.search.daum.net/search_nsuggest?mod=fxjson&code=utf_in_out&"
-      "q={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_DAUM,
-  68,
-};
-
-const PrepopulatedEngine delfi_lt = {
-  L"DELFI",
-  L"delfi.lt",
-  "http://search.delfi.lt/img/favicon.png",
-  "http://search.delfi.lt/search.php?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_DELFI,
-  45,
-};
-
-const PrepopulatedEngine delfi_lv = {
-  L"DELFI",
-  L"delfi.lv",
-  "http://smart.delfi.lv/img/smart_search.png",
-  "http://smart.delfi.lv/i.php?enc={inputEncoding}&q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_DELFI,
-  45,
-};
-
-const PrepopulatedEngine diri = {
-  L"diri",
-  L"diri.bg",
-  "http://i.dir.bg/diri/images/favicon.ico",
-  "http://diri.bg/search.php?textfield={searchTerms}",
-  "windows-1251",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_DIRI,
-  32,
-};
-
-const PrepopulatedEngine eniro_fi = {
-  L"Eniro",
-  L"eniro.fi",
-  "http://eniro.fi/favicon.ico",
-  "http://eniro.fi/query?search_word={searchTerms}&what=web_local",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  29,
-};
-
-const PrepopulatedEngine eniro_se = {
-  L"Eniro",
-  L"eniro.se",
-  "http://eniro.se/favicon.ico",
-  "http://eniro.se/query?search_word={searchTerms}&what=web_local",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  29,
-};
-
-const PrepopulatedEngine fonecta_02_fi = {
-  L"Fonecta 02.fi",
-  L"www.fi",
-  "http://www.02.fi/img/favicon.ico",
-  "http://www.02.fi/haku/{searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  46,
-};
-
-const PrepopulatedEngine goo = {
-  L"goo",
-  L"search.goo.ne.jp",
-  "http://goo.ne.jp/favicon.ico",
-  "http://search.goo.ne.jp/web.jsp?MT={searchTerms}&IE={inputEncoding}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_GOO,
-  23,
-};
-
-const PrepopulatedEngine google = {
-  L"Google",
-  L"google.com",  // This will be dynamically updated by the TemplateURL system.
-  "http://www.google.com/favicon.ico",
-  "{google:baseURL}search?q={searchTerms}&{google:RLZ}"
-      "{google:acceptedSuggestion}{google:originalQueryForSuggestion}"
-      "{google:assistedQueryStats}{google:searchFieldtrialParameter}"
-      "sourceid=chrome&ie={inputEncoding}",
-  "UTF-8",
-  "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}"
-      "client=chrome&hl={language}&q={searchTerms}&"
-      "sugkey={google:suggestAPIKeyParameter}",
-  "{google:baseURL}webhp?sourceid=chrome-instant&{google:RLZ}"
-      "{google:instantEnabledParameter}ie={inputEncoding}",
-  "[\"{google:baseURL}#q={searchTerms}\", "
-  "\"{google:baseURL}search#q={searchTerms}\", "
-  "\"{google:baseURL}webhp#q={searchTerms}\"]",
-  SEARCH_ENGINE_GOOGLE,
-  1,
-};
-
-const PrepopulatedEngine guruji = {
-  L"guruji",
-  L"guruji.com",
-  "http://guruji.com/favicon.ico",
-  "http://guruji.com/search?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  38,
-};
-
-const PrepopulatedEngine hispavista = {
-  L"hispavista",
-  L"hispavista.com",
-  "http://buscar.hispavista.com/favicon.ico",
-  "http://buscar.hispavista.com/?cadena={searchTerms}",
-  "iso-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  18,
-};
-
-const PrepopulatedEngine in = {
-  L"in.gr",
-  L"in.gr",
-  "http://www.in.gr/favicon.ico",
-  "http://find.in.gr/?qs={searchTerms}",
-  "ISO-8859-7",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_IN,
-  54,
-};
-
-const PrepopulatedEngine jabse = {
-  L"Jabse",
-  L"jabse.com",
-  "http://www.jabse.com/favicon.ico",
-  "http://www.jabse.com/searchmachine.php?query={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  19,
-};
-
-const PrepopulatedEngine jubii = {
-  L"Jubii",
-  L"jubii.dk",
-  "http://search.jubii.dk/favicon_jubii.ico",
-  "http://search.jubii.dk/cgi-bin/pursuit?query={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  28,
-};
-
-const PrepopulatedEngine kvasir = {
-  L"Kvasir",
-  L"kvasir.no",
-  "http://www.kvasir.no/img/favicon.ico",
-  "http://www.kvasir.no/nettsok/searchResult.html?searchExpr={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  73,
-};
-
-const PrepopulatedEngine latne = {
-  L"LATNE",
-  L"latne.lv",
-  "http://latne.lv/favicon.ico",
-  "http://latne.lv/siets.php?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  71,
-};
-
-const PrepopulatedEngine leit = {
-  L"leit.is",
-  L"leit.is",
-  "http://leit.is/leit.ico",
-  "http://leit.is/query.aspx?qt={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  59,
-};
-
-const PrepopulatedEngine libero = {
-  L"Libero",
-  L"libero.it",
-  "http://arianna.libero.it/favicon.ico",
-  "http://arianna.libero.it/search/abin/integrata.cgi?query={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  63,
-};
-
-const PrepopulatedEngine mail_ru = {
-  L"@MAIL.RU",
-  L"mail.ru",
-  "http://img.go.mail.ru/favicon.ico",
-  "http://go.mail.ru/search?q={searchTerms}",
-  "windows-1251",
-  "http://suggests.go.mail.ru/chrome?q={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_MAILRU,
-  83,
-};
-
-const PrepopulatedEngine maktoob = {
-  L"\x0645\x0643\x062a\x0648\x0628",
-  L"maktoob.com",
-  "http://www.maktoob.com/favicon.ico",
-  "http://www.maktoob.com/searchResult.php?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  13,
-};
-
-const PrepopulatedEngine masrawy = {
-  L"\x0645\x0635\x0631\x0627\x0648\x064a",
-  L"masrawy.com",
-  "http://www.masrawy.com/new/images/masrawy.ico",
-  "http://masrawy.com/new/search.aspx?sr={searchTerms}",
-  "windows-1256",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  14,
-};
-
-const PrepopulatedEngine mynet = {
-  L"MYNET",
-  L"mynet.com",
-  "http://img.mynet.com/mynetfavori.ico",
-  "http://arama.mynet.com/search.aspx?q={searchTerms}&pg=q",
-  "windows-1254",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  101,
-};
-
-const PrepopulatedEngine najdi = {
-  L"Najdi.si",
-  L"najdi.si",
-  "http://www.najdi.si/master/favicon.ico",
-  "http://www.najdi.si/search.jsp?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_NAJDI,
-  87,
-};
-
-const PrepopulatedEngine nate = {
-  L"\xb124\xc774\xd2b8\xb2f7\xcef4",
-  L"nate.com",
-  "http://nate.search.empas.com/favicon.ico",
-  "http://nate.search.empas.com/search/all.html?q={searchTerms}",
-  "EUC-KR",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  69,
-};
-
-const PrepopulatedEngine naver = {
-  L"\xb124\xc774\xbc84",
-  L"naver.com",
-  "http://search.naver.com/favicon.ico",
-  "http://search.naver.com/search.naver?ie={inputEncoding}&query={searchTerms}",
-  "UTF-8",
-  "http://ac.search.naver.com/autocompl?m=s&ie={inputEncoding}&oe=utf-8&"
-      "q={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_NAVER,
-  67,
-};
-
-const PrepopulatedEngine neti = {
-  L"NETI",
-  L"neti.ee",
-  "http://www.neti.ee/favicon.ico",
-  "http://www.neti.ee/cgi-bin/otsing?query={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_NETI,
-  44,
-};
-
-const PrepopulatedEngine netsprint = {
-  L"NetSprint",
-  L"netsprint.pl",
-  "http://netsprint.pl/favicon.ico",
-  "http://www.netsprint.pl/serwis/search?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_NETSPRINT,
-  30,
-};
-
-const PrepopulatedEngine nur_kz = {
-  L"NUR.KZ",
-  L"nur.kz",
-  "http://www.nur.kz/favicon_kz.ico",
-  "http://search.nur.kz/?encoding={inputEncoding}&query={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  20,
-};
-
-const PrepopulatedEngine ok = {
-  L"OK.hu",
-  L"ok.hu",
-  "http://ok.hu/gfx/favicon.ico",
-  "http://ok.hu/katalogus?q={searchTerms}",
-  "ISO-8859-2",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OK,
-  6,
-};
-
-const PrepopulatedEngine onet = {
-  L"Onet.pl",
-  L"onet.pl",
-  "http://szukaj.onet.pl/favicon.ico",
-  "http://szukaj.onet.pl/query.html?qt={searchTerms}",
-  "ISO-8859-2",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  75,
-};
-
-const PrepopulatedEngine pogodak_rs = {
-  L"Pogodak!",
-  L"pogodak.rs",
-  "http://www.pogodak.rs/favicon.ico",
-  "http://www.pogodak.rs/search.jsp?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_POGODAK,
-  24,
-};
-
-const PrepopulatedEngine rambler = {
-  L"Rambler",
-  L"rambler.ru",
-  "http://www.rambler.ru/favicon.ico",
-  "http://www.rambler.ru/srch?words={searchTerms}",
-  "windows-1251",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_RAMBLER,
-  16,
-};
-
-const PrepopulatedEngine rediff = {
-  L"Rediff",
-  L"rediff.com",
-  "http://search1.rediff.com/favicon.ico",
-  "http://search1.rediff.com/dirsrch/default.asp?MT={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  37,
-};
-
-const PrepopulatedEngine rednano = {
-  L"Rednano",
-  L"rednano.sg",
-  "http://rednano.sg/favicon.ico",
-  "http://rednano.sg/sfe/lwi.action?querystring={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  41,
-};
-
-const PrepopulatedEngine sanook = {
-  L"\x0e2a\x0e19\x0e38\x0e01!",
-  L"sanook.com",
-  "http://search.sanook.com/favicon.ico",
-  "http://search.sanook.com/search.php?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_SANOOK,
-  100,
-};
-
-const PrepopulatedEngine sapo = {
-  L"SAPO",
-  L"sapo.pt",
-  "http://imgs.sapo.pt/images/sapo.ico",
-  "http://pesquisa.sapo.pt/?q={searchTerms}",
-  "UTF-8",
-  "http://pesquisa.sapo.pt/livesapo?q={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_SAPO,
-  77,
-};
-
-const PrepopulatedEngine search_de_CH = {
-  L"search.ch",
-  L"search.ch",
-  "http://www.search.ch/favicon.ico",
-  "http://www.search.ch/index.de.html?q={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  51,
-};
-
-const PrepopulatedEngine search_fr_CH = {
-  L"search.ch",
-  L"search.ch_",  // search.ch is taken by search_de_CH.
-  "http://www.search.ch/favicon.ico",
-  "http://www.search.ch/index.fr.html?q={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  22,
-};
-
-const PrepopulatedEngine seznam = {
-  L"Seznam",
-  L"seznam.cz",
-  "http://1.im.cz/szn/img/favicon.ico",
-  "http://search.seznam.cz/?q={searchTerms}",
-  "UTF-8",
-  "http:///suggest.fulltext.seznam.cz/?dict=fulltext_ff&phrase={searchTerms}&"
-      "encoding={inputEncoding}&response_encoding=utf-8",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_SEZNAM,
-  25,
-};
-
-const PrepopulatedEngine terra_ar = {
-  L"Terra Argentina",
-  L"terra.com.ar",
-  "http://buscar.terra.com.ar/favicon.ico",
-  "http://buscar.terra.com.ar/Default.aspx?query={searchTerms}&source=Search",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  90,
-};
-
-const PrepopulatedEngine terra_es = {
-  L"Terra",
-  L"terra.es",
-  "http://buscador.terra.es/favicon.ico",
-  "http://buscador.terra.es/Default.aspx?query={searchTerms}&source=Search",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  90,
-};
-
-const PrepopulatedEngine tut = {
-  L"TUT.BY",
-  L"tut.by",
-  "http://www.tut.by/favicon.ico",
-  "http://search.tut.by/?query={searchTerms}",
-  "windows-1251",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_TUT,
-  17,
-};
-
-const PrepopulatedEngine uol = {
-  L"UOL Busca",
-  L"busca.uol.com.br",
-  "http://busca.uol.com.br/favicon.ico",
-  "http://busca.uol.com.br/www/index.html?q={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  82,
-};
-
-const PrepopulatedEngine virgilio = {
-  L"Virgilio",
-  L"virgilio.it",
-  "http://ricerca.alice.it/favicon.ico",
-  "http://ricerca.alice.it/ricerca?qs={searchTerms}",
-  "ISO-8859-1",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_VIRGILIO,
-  62,
-};
-
-const PrepopulatedEngine walla = {
-  L"\x05d5\x05d5\x05d0\x05dc\x05d4!",
-  L"walla.co.il",
-  "http://www.walla.co.il/favicon.ico",
-  "http://search.walla.co.il/?e=hew&q={searchTerms}",
-  "windows-1255",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_WALLA,
-  55,
-};
-
-const PrepopulatedEngine wp = {
-  L"Wirtualna Polska",
-  L"wp.pl",
-  "http://szukaj.wp.pl/favicon.ico",
-  "http://szukaj.wp.pl/szukaj.html?szukaj={searchTerms}",
-  "ISO-8859-2",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  76,
-};
-
-const PrepopulatedEngine yahoo = {
-  L"Yahoo!",
-  L"yahoo.com",
-  "http://search.yahoo.com/favicon.ico",
-  "http://search.yahoo.com/search?ei={inputEncoding}&fr=crmas&p={searchTerms}",
-  "UTF-8",
-  "http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  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",
-  "http://ar.search.yahoo.com/favicon.ico",
-  "http://ar.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://ar-sayt.ff.search.yahoo.com/gossip-ar-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_at = {
-  L"Yahoo! Suche",
-  L"at.yahoo.com",
-  "http://at.search.yahoo.com/favicon.ico",
-  "http://at.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_au = {
-  L"Yahoo!7",
-  L"au.yahoo.com",
-  "http://au.search.yahoo.com/favicon.ico",
-  "http://au.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://aue-sayt.ff.search.yahoo.com/gossip-au-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_br = {
-  L"Yahoo! Brasil",
-  L"br.yahoo.com",
-  "http://br.search.yahoo.com/favicon.ico",
-  "http://br.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://br-sayt.ff.search.yahoo.com/gossip-br-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_ca = {
-  L"Yahoo! Canada",
-  L"ca.yahoo.com",
-  "http://ca.search.yahoo.com/favicon.ico",
-  "http://ca.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://gossip.ca.yahoo.com/gossip-ca-sayt?output=fxjsonp&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_ch = {
-  L"Yahoo! Suche",
-  L"ch.yahoo.com",
-  "http://ch.search.yahoo.com/favicon.ico",
-  "http://ch.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_cl = {
-  L"Yahoo! Chile",
-  L"cl.yahoo.com",
-  "http://cl.search.yahoo.com/favicon.ico",
-  "http://cl.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_cn = {
-  L"\x4e2d\x56fd\x96c5\x864e",
-  L"cn.yahoo.com",
-  "http://search.cn.yahoo.com/favicon.ico",
-  "http://search.cn.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "GB2312",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_co = {
-  L"Yahoo! Colombia",
-  L"co.yahoo.com",
-  "http://co.search.yahoo.com/favicon.ico",
-  "http://co.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_de = {
-  L"Yahoo! Deutschland",
-  L"de.yahoo.com",
-  "http://de.search.yahoo.com/favicon.ico",
-  "http://de.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://de-sayt.ff.search.yahoo.com/gossip-de-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_dk = {
-  L"Yahoo! Danmark",
-  L"dk.yahoo.com",
-  "http://dk.search.yahoo.com/favicon.ico",
-  "http://dk.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_es = {
-  L"Yahoo! Espa" L"\x00f1" L"a",
-  L"es.yahoo.com",
-  "http://es.search.yahoo.com/favicon.ico",
-  "http://es.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://es-sayt.ff.search.yahoo.com/gossip-es-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_fi = {
-  L"Yahoo!-haku",
-  L"fi.yahoo.com",
-  "http://fi.search.yahoo.com/favicon.ico",
-  "http://fi.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_fr = {
-  L"Yahoo! France",
-  L"fr.yahoo.com",
-  "http://fr.search.yahoo.com/favicon.ico",
-  "http://fr.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://fr-sayt.ff.search.yahoo.com/gossip-fr-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_hk = {
-  L"Yahoo! Hong Kong",
-  L"hk.yahoo.com",
-  "http://hk.search.yahoo.com/favicon.ico",
-  "http://hk.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_id = {
-  L"Yahoo! Indonesia",
-  L"id.yahoo.com",
-  "http://id.search.yahoo.com/favicon.ico",
-  "http://id.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://id-sayt.ff.search.yahoo.com/gossip-id-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_in = {
-  L"Yahoo! India",
-  L"in.yahoo.com",
-  "http://in.search.yahoo.com/favicon.ico",
-  "http://in.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://in-sayt.ff.search.yahoo.com/gossip-in-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_it = {
-  L"Yahoo! Italia",
-  L"it.yahoo.com",
-  "http://it.search.yahoo.com/favicon.ico",
-  "http://it.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://it-sayt.ff.search.yahoo.com/gossip-it-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_jp = {
-  L"Yahoo! JAPAN",
-  L"yahoo.co.jp",
-  "http://search.yahoo.co.jp/favicon.ico",
-  "http://search.yahoo.co.jp/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOOJP,
-  2,
-};
-
-const PrepopulatedEngine yahoo_kr = {
-  L"\xc57c\xd6c4! \xcf54\xb9ac\xc544",
-  L"kr.yahoo.com",
-  "http://kr.search.yahoo.com/favicon.ico",
-  "http://kr.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://kr.atc.search.yahoo.com/atcx.php?property=main&ot=fxjson&"
-     "ei=utf8&eo=utf8&command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_malaysia = {
-  L"Yahoo! Malaysia",
-  L"malaysia.yahoo.com",
-  "http://malaysia.search.yahoo.com/favicon.ico",
-  "http://malaysia.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://my-sayt.ff.search.yahoo.com/gossip-my-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_mx = {
-  L"Yahoo! M\x00e9xico",
-  L"mx.yahoo.com",
-  "http://mx.search.yahoo.com/favicon.ico",
-  "http://mx.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://gossip.mx.yahoo.com/gossip-mx-sayt?output=fxjsonp&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_nl = {
-  L"Yahoo! Nederland",
-  L"nl.yahoo.com",
-  "http://nl.search.yahoo.com/favicon.ico",
-  "http://nl.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_no = {
-  L"Yahoo! Norge",
-  L"no.yahoo.com",
-  "http://no.search.yahoo.com/favicon.ico",
-  "http://no.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_nz = {
-  L"Yahoo!Xtra",
-  L"nz.yahoo.com",
-  "http://nz.search.yahoo.com/favicon.ico",
-  "http://nz.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://aue-sayt.ff.search.yahoo.com/gossip-nz-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_pe = {
-  L"Yahoo! Per\x00fa",
-  L"pe.yahoo.com",
-  "http://pe.search.yahoo.com/favicon.ico",
-  "http://pe.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_ph = {
-  L"Yahoo! Philippines",
-  L"ph.yahoo.com",
-  "http://ph.search.yahoo.com/favicon.ico",
-  "http://ph.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://ph-sayt.ff.search.yahoo.com/gossip-ph-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_qc = {
-  L"Yahoo! Qu" L"\x00e9" L"bec",
-  L"qc.yahoo.com",
-  "http://qc.search.yahoo.com/favicon.ico",
-  "http://qc.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "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.
-};
-
-const PrepopulatedEngine yahoo_ru = {
-  L"Yahoo! \x043f\x043e-\x0440\x0443\x0441\x0441\x043a\x0438",
-  L"ru.yahoo.com",
-  "http://ru.search.yahoo.com/favicon.ico",
-  "http://ru.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_se = {
-  L"Yahoo! Sverige",
-  L"se.yahoo.com",
-  "http://se.search.yahoo.com/favicon.ico",
-  "http://se.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_sg = {
-  L"Yahoo! Singapore",
-  L"sg.yahoo.com",
-  "http://sg.search.yahoo.com/favicon.ico",
-  "http://sg.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://sg-sayt.ff.search.yahoo.com/gossip-sg-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_th = {
-  L"Yahoo! \x0e1b\x0e23\x0e30\x0e40\x0e17\x0e28\x0e44\x0e17\x0e22",
-  L"th.yahoo.com",
-  "http://th.search.yahoo.com/favicon.ico",
-  "http://th.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://th-sayt.ff.search.yahoo.com/gossip-th-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_tw = {
-  L"Yahoo!\x5947\x6469",
-  L"tw.yahoo.com",
-  "http://tw.search.yahoo.com/favicon.ico",
-  "http://tw.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_uk = {
-  L"Yahoo! UK & Ireland",
-  L"uk.yahoo.com",
-  "http://uk.search.yahoo.com/favicon.ico",
-  "http://uk.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://uk-sayt.ff.search.yahoo.com/gossip-uk-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_ve = {
-  L"Yahoo! Venezuela",
-  L"ve.yahoo.com",
-  "http://ve.search.yahoo.com/favicon.ico",
-  "http://ve.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yahoo_vn = {
-  L"Yahoo! Vi\x1ec7t Nam",
-  L"vn.yahoo.com",
-  "http://vn.search.yahoo.com/favicon.ico",
-  "http://vn.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
-      "p={searchTerms}",
-  "UTF-8",
-  "http://vn-sayt.ff.search.yahoo.com/gossip-vn-sayt?output=fxjson&"
-      "command={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YAHOO,
-  2,
-};
-
-const PrepopulatedEngine yamli = {
-  L"Yamli",
-  L"yamli.com",
-  "http://www.yamli.com/favicon.ico",
-  "http://www.yamli.com/#q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_OTHER,
-  11,
-};
-
-const PrepopulatedEngine yandex_ru = {
-  L"\x042f\x043d\x0434\x0435\x043a\x0441",
-  L"yandex.ru",
-  "http://yandex.ru/favicon.ico",
-  "http://yandex.ru/yandsearch?text={searchTerms}",
-  "UTF-8",
-  "http://suggest.yandex.net/suggest-ff.cgi?part={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YANDEX,
-  15,
-};
-
-const PrepopulatedEngine yandex_ua = {
-  L"\x042f\x043d\x0434\x0435\x043a\x0441",
-  L"yandex.ua",
-  "http://yandex.ua/favicon.ico",
-  "http://yandex.ua/yandsearch?text={searchTerms}",
-  "UTF-8",
-  "http://suggest.yandex.net/suggest-ff.cgi?part={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YANDEX,
-  15,
-};
-
-const PrepopulatedEngine zoznam = {
-  L"Zoznam",
-  L"zoznam.sk",
-  "http://zoznam.sk/favicon.ico",
-  "http://zoznam.sk/hladaj.fcgi?s={searchTerms}",
-  "windows-1250",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ZOZNAM,
-  85,
-};
-
-// UMA-only engines ////////////////////////////////////////////////////////////
-
-// The following engines are not included in any of the country lists. They
-// are listed in |kAllEngines|, however, so that GetEngineType can find them
-// for UMA reporting purposes.
-
-const PrepopulatedEngine all_by = {
-  L"ALL.BY",
-  L"all.by",
-  NULL,
-  "http://www.all.by/cgi-bin/search.cgi?mode=by&query={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ALL_BY,
-  33,
-};
-
-const PrepopulatedEngine aport = {
-  L"Aport",
-  L"aport.ru",
-  NULL,
-  "http://www.aport.ru/search/?r={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_APORT,
-  34,
-};
-
-const PrepopulatedEngine avg = {
-  L"AVG Secure Search",
-  L"search.avg.com",
-  NULL,
-  "http://search.avg.com/route/?q={searchTerms}&lng={language}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_AVG,
-  50,
-};
-
-const PrepopulatedEngine avg_i = {
-  L"AVG Secure Search",
-  L"isearch.avg.com",
-  NULL,
-  "http://isearch.avg.com/search?q={searchTerms}&lng={language}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_AVG,
-  52,
-};
-
-const PrepopulatedEngine conduit = {
-  L"Conduit",
-  L"conduit.com",
-  NULL,
-  "http://search.conduit.com/Results.aspx?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_CONDUIT,
-  36,
-};
-
-const PrepopulatedEngine icq = {
-  L"ICQ",
-  L"icq.com",
-  NULL,
-  "http://search.icq.com/search/results.php?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_ICQ,
-  39,
-};
-
-const PrepopulatedEngine meta_ua = {
-  L"Meta-Ukraine",
-  L"meta.ua",
-  NULL,
-  "http://meta.ua/search.asp?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_META_UA,
-  40,
-};
-
-const PrepopulatedEngine metabot_ru = {
-  L"Metabot",
-  L"metabot.ru",
-  NULL,
-  "http://results.metabot.ru/?st={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_METABOT_RU,
-  42,
-};
-
-const PrepopulatedEngine nigma = {
-  L"Nigma",
-  L"nigma.ru",
-  NULL,
-  "http://www.nigma.ru/?s={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_NIGMA,
-  43,
-};
-
-const PrepopulatedEngine qip = {
-  L"QIP",
-  L"qip.ru",
-  NULL,
-  "http://search.qip.ru/?query={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_QIP,
-  47,
-};
-
-const PrepopulatedEngine ukr_net = {
-  L"Ukr.net",
-  L"ukr.net",
-  NULL,
-  "http://search.ukr.net/google/search.php?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_UKR_NET,
-  48,
-};
-
-const PrepopulatedEngine webalta = {
-  L"Webalta",
-  L"webalta.ru",
-  NULL,
-  "http://webalta.ru/search?q={searchTerms}",
-  "UTF-8",
-  NULL,
-  NULL,
-  NULL,
-  SEARCH_ENGINE_WEBALTA,
-  49,
-};
-
-const PrepopulatedEngine yandex_tr = {
-  L"Yandex",
-  L"yandex.com.tr",
-  "http://yandex.com.tr/favicon.ico",
-  "http://yandex.com.tr/yandsearch?text={searchTerms}",
-  "UTF-8",
-  "http://suggest.yandex.net/suggest-ff.cgi?part={searchTerms}",
-  NULL,
-  NULL,
-  SEARCH_ENGINE_YANDEX,
-  15,
-};
+// NOTE: You should probably not change the data in this file without changing
+// |kCurrentDataVersion| in prepopulated_engines.json. See comments in
+// GetDataVersion() below!
 
 // Lists of engines per country ////////////////////////////////////////////////
 
 // Put these in order with most interesting/important first.  The default will
 // be the first engine.
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* engines_default[] =
     { &google, &yahoo, &bing, };
 
@@ skipping 1017 matching lines @@
 };
 
 const LogoURLs google_logos = {
   "https://www.google.com/images/chrome_search/google_logo.png",
   "https://www.google.com/images/chrome_search/google_logo_2x.png",
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 
-}  // namespace
-
-namespace TemplateURLPrepopulateData {
-
 // The following id is for UMA stats only. Please update
 // kMaxPrepopulatedEngineID if it changes upwards.
 const int kMaxPrepopulatedEngineID = 101;
 
 void RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kCountryIDAtInstall,
                              kCountryIDUnknown,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kSearchProviderOverrides,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kSearchProviderOverridesVersion,
                              -1,
                              PrefService::UNSYNCABLE_PREF);
   // Obsolete pref, for migration.
   prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall,
                              -1,
                              PrefService::UNSYNCABLE_PREF);
 }
 
 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 = 45;
   // 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,
@@ skipping 68 matching lines @@
           encoding, id));
     }
   }
 }
 
 // The caller owns the returned TemplateURL.
 TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
     Profile* profile,
     const PrepopulatedEngine& engine) {
 
-  // Use an empty list if there are no alternate_urls.
-  ListValue empty_list;
-  ListValue* alternate_urls = &empty_list;
-  // Will hold the result of |ReadToValue|, which we own.
-  scoped_ptr<Value> value;
+  ListValue alternate_urls;
   if (engine.alternate_urls) {
-    base::JSONReader json_reader;
-    value.reset(json_reader.ReadToValue(std::string(engine.alternate_urls)));
-    DCHECK(value.get());
-    value->GetAsList(&alternate_urls);
+    for (size_t i = 0; i < sizeof(engine.alternate_urls) /
+         sizeof(engine.alternate_urls[0]); ++i) {

[Peter Kasting, 2012/11/12 22:46:36]

Can we use arraysize() somehow instead?  Maybe we need to declare the field as
an array of pointers instead of a pointer to pointers?

[beaudoin, 2012/11/13 18:44:26]

Unfortunately it wont let me declare it as an array of pointers unless it's the
last element in the structure, and then it cannot be initialized with NULL. This
would make the generator much less general and the code relatively complex.

In fact, I've discovered (thanks unit tests!) that my way of counting the number
of elements in the array always returns 1. Instead, I'm now having the Python
generate an extra field containing the size of the array. (Alternate option is
generating a NULL-terminated array but it would only works for pointer types.
Not sure the extra comlexity is worth the marginal gain in memory footprint.)

Done.

+      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, *alternate_urls,
+      engine.instant_url, alternate_urls,
       engine.favicon_url, engine.encoding, engine.id);
 }
 
 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);
@@ skipping 81 matching lines @@
     g_country_code_at_install = kCountryIDUnknown;
   } else {
     g_country_code_at_install =
         CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
   }
 }
 
 #endif
 
 }  // namespace TemplateURLPrepopulateData