Update prepopulate data by request for a couple different issues....

chrome/browser/template_url_prepopulate_data.cc

 // Copyright (c) 2006-2008 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/template_url_prepopulate_data.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 27 matching lines @@
   //
   // 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. Live Search U.S. English and Spanish), we
   // must use two different unique IDs (and different keywords).
   //
-  // The following unique IDs are available: 92, 93, 103+
+  // The following unique IDs are available: 66, 93, 103+
   // NOTE: CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad!
   const int id;
 };
 
 const PrepopulatedEngine abcsok = {
   L"ABC S\x00f8k",
   L"abcsok.no",
   L"http://abcsok.no/favicon.ico",
   L"http://abcsok.no/index.html?q={searchTerms}",
   "UTF-8",
@@ skipping 403 matching lines @@
   L"GO.com",
   L"go.com",
   L"http://search.yahoo.com/favicon.ico",
   L"http://search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}&"
       L"fr=hsusgo1",
   "ISO-8859-1",
   NULL,
   40,
 };
 
+const PrepopulatedEngine goo = {
+  L"goo",
+  L"goo.ne.jp",
+  L"http://goo.ne.jp/gooicon.ico",
+  L"http://search.goo.ne.jp/web.jsp?MT={searchTerms}&IE={inputEncoding}",
+  "UTF-8",
+  NULL,
+  92,
+};
+
 const PrepopulatedEngine google = {
   L"Google",
   NULL,
   L"http://www.google.com/favicon.ico",
   L"{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}"
       L"{google:originalQueryForSuggestion}sourceid=chrome&ie={inputEncoding}&"
       L"q={searchTerms}",
   "UTF-8",
   L"{google:baseSuggestURL}search?client=chrome&output=chrome&hl={language}&"
       L"q={searchTerms}",
@@ skipping 33 matching lines @@
 const PrepopulatedEngine in = {
   L"in.gr",
   L"in.gr",
   L"http://www.in.gr/favicon.ico",
   L"http://find.in.gr/result.asp?q={searchTerms}",
   "ISO-8859-7",
   NULL,
   54,
 };
 
-const PrepopulatedEngine infoseek = {
-  L"Infoseek",
-  L"infoseek.co.jp",
-  L"http://search.www.infoseek.co.jp/favicon.ico",
-  L"http://search.www.infoseek.co.jp/Web?qt={searchTerms}&enc={inputEncoding}",
-  "EUC-JP",
-  NULL,
-  66,
-};
-
 const PrepopulatedEngine jabse = {
   L"Jabse",
   L"jabse.com",
   L"http://www.jabse.com/favicon.ico",
   L"http://www.jabse.com/searchmachine.php?query={searchTerms}",
   "UTF-8",
   NULL,
   19,
 };
 
@@ skipping 1051 matching lines @@
   L"http://szm.sk/search/?co=1&q={searchTerms}",
   "windows-1250",
   NULL,
   86,
 };
 
 const PrepopulatedEngine t_online = {
   L"T-Online",
   L"suche.t-online.de",
   L"http://suche.t-online.de/favicon.ico",
-  L"http://suche.t-online.de/fast-cgi/tsc?q={searchTerms}",
+  L"http://suche.t-online.de/fast-cgi/tsc?sr=chrome&q={searchTerms}",
   "UTF-8",
   NULL,
   49,
 };
 
 const PrepopulatedEngine tango = {
   L"Tango",
   L"tango.hu",
   L"http://tango.hu/favicon.ico",
   L"http://tango.hu/search.php?q={searchTerms}",
@@ skipping 801 matching lines @@
 // Jamaica
 const PrepopulatedEngine* engines_JM[] =
     { &google, &jamaicalive, &yahoo, &live, &go, &aol, };
 
 // Jordan
 const PrepopulatedEngine* engines_JO[] =
     { &google, &maktoob, &yamli, &yahoo, &araby, &msn_en_XA, &msn_ar_XA, };
 
 // Japan
 const PrepopulatedEngine* engines_JP[] =
-    { &google, &yahoo_jp, &msn_ja_JP, &biglobe, &nifty, &infoseek, };
+    { &google, &yahoo_jp, &msn_ja_JP, &biglobe, &goo, &nifty, };
 
 // Kenya
 const PrepopulatedEngine* engines_KE[] = { &google, &yahoo, &msn, };
 
 // Kuwait
 const PrepopulatedEngine* engines_KW[] =
     { &google, &maktoob, &yahoo, &yamli, &araby, &msn_en_XA, &msn_ar_XA, };
 
 // South Korea
 const PrepopulatedEngine* engines_KR[] =
@@ skipping 560 matching lines @@
 
 }  // namespace
 
 namespace TemplateURLPrepopulateData {
 
 void RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall, -1);
 }
 
 int GetDataVersion() {
-  return 16;  // Increment this if you change the above data in ways that mean
+  return 17;  // 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