Change a bunch of string types.

Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).

TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.

BUG=none
TEST=try bots

Review URL: http://codereview.chromium.org/2854015

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

2 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 02ac222..870d2d7 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -546,7 +546,7 @@ static void BindURLToStatement(const TemplateURL& url, sql::Statement* s) {
                        url.GetFavIconURL()));
   }
   if (url.url())
-    s->BindString(3, WideToUTF8(url.url()->url()));
+    s->BindString(3, url.url()->url());
   else
     s->BindString(3, std::string());
   s->BindInt(4, url.safe_for_autoreplace() ? 1 : 0);
@@ -561,7 +561,7 @@ static void BindURLToStatement(const TemplateURL& url, sql::Statement* s) {
   s->BindString(8, JoinStrings(";", url.input_encodings()));
   s->BindInt(9, url.show_in_default_list() ? 1 : 0);
   if (url.suggestions_url())
-    s->BindString(10, WideToUTF8(url.suggestions_url()->url()));
+    s->BindString(10, url.suggestions_url()->url());
   else
     s->BindString(10, std::string());
   s->BindInt(11, url.prepopulate_id());
@@ -629,7 +629,7 @@ bool WebDatabase::GetKeywords(std::vector<TemplateURL*>* urls) {
       template_url->SetFavIconURL(GURL(tmp));
 
     tmp = s.ColumnString(4);
-    template_url->SetURL(UTF8ToWide(tmp), 0, 0);
+    template_url->SetURL(tmp, 0, 0);
 
     template_url->set_safe_for_autoreplace(s.ColumnInt(5) == 1);
 
@@ -648,7 +648,7 @@ bool WebDatabase::GetKeywords(std::vector<TemplateURL*>* urls) {
     template_url->set_show_in_default_list(s.ColumnInt(10) == 1);
 
     tmp = s.ColumnString(11);
-    template_url->SetSuggestionsURL(UTF8ToWide(tmp), 0, 0);
+    template_url->SetSuggestionsURL(tmp, 0, 0);
 
     template_url->set_prepopulate_id(s.ColumnInt(12));
 
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index 0b9af58..3d3d1cf9 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -177,7 +177,7 @@ TEST_F(WebDatabaseTest, Keywords) {
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://google.com/");
   template_url.SetFavIconURL(favicon_url);
-  template_url.SetURL(L"http://url/", 0, 0);
+  template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   template_url.set_show_in_default_list(true);
   template_url.set_originating_url(originating_url);
@@ -253,10 +253,10 @@ TEST_F(WebDatabaseTest, UpdateKeyword) {
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://originating.url/");
   template_url.SetFavIconURL(favicon_url);
-  template_url.SetURL(L"http://url/", 0, 0);
+  template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   template_url.set_show_in_default_list(true);
-  template_url.SetSuggestionsURL(L"url2", 0, 0);
+  template_url.SetSuggestionsURL("url2", 0, 0);
   SetID(1, &template_url);
 
   EXPECT_TRUE(db.AddKeyword(template_url));
@@ -312,7 +312,7 @@ TEST_F(WebDatabaseTest, KeywordWithNoFavicon) {
   TemplateURL template_url;
   template_url.set_short_name(L"short_name");
   template_url.set_keyword(L"keyword");
-  template_url.SetURL(L"http://url/", 0, 0);
+  template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   SetID(-100, &template_url);