Changes Live Search to Bing for en_US only. A full worldwide review is in progress and we'll pick up the other countries eventually.

Added some temporary comments on the Bing entry since the way it's coexisting with the Live entries right now makes for a few slightly unusual bits.

BUG=13065
TEST=Search providers should show Bing and not Live Search, setting Bing to default should result in working Suggest and search functionality.
Review URL: http://codereview.chromium.org/171065

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23571 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index c27ccac..d0e47f7 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -293,6 +293,17 @@ const PrepopulatedEngine bigmir = {
   33,
 };
 
+const PrepopulatedEngine bing_en_US = {  // "en_US" since we'll add more soon
+  L"Bing",
+  L"bing.com",
+  "http://www.bing.com/s/wlflag.ico",
+  L"http://www.bing.com/search?setmkt=en-US&q={searchTerms}",
+  "UTF-8",
+  L"http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}&"
+      L"form=OSDJAS",
+  3,  // Same unique ID as Live, since we'll be replacing it
+};
+
 const PrepopulatedEngine bluewin = {
   L"Bluewin",
   L"search.bluewin.ch",
@@ -691,17 +702,6 @@ const PrepopulatedEngine live_en_NZ = {
   3,
 };
 
-const PrepopulatedEngine live_en_US = {
-  L"Live Search",
-  L"live.com",
-  "http://search.live.com/s/wlflag.ico",
-  L"http://search.live.com/results.aspx?setlang=en-US&mkt=en-US&"
-      L"q={searchTerms}",
-  "UTF-8",
-  NULL,
-  3,
-};
-
 const PrepopulatedEngine live_en_XA = {
   L"Live Search (English)",
   L"live.com",
@@ -2645,7 +2645,7 @@ const PrepopulatedEngine* engines_UA[] =
 
 // United States
 const PrepopulatedEngine* engines_US[] =
-    { &google, &yahoo, &live_en_US, &aol, &ask, };
+    { &google, &yahoo, &bing_en_US, &aol, &ask, };
 
 // Uruguay
 const PrepopulatedEngine* engines_UY[] =
@@ -3185,7 +3185,7 @@ void RegisterUserPrefs(PrefService* prefs) {
 }
 
 int GetDataVersion() {
-  return 23;  // Increment this if you change the above data in ways that mean
+  return 24;  // Increment this if you change the above data in ways that mean
               // users with existing data should get a new version.
 }