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

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/options/system_page_view.cc b/chrome/browser/chromeos/options/system_page_view.cc
index 7b5c27a..f9ff16d 100644
--- a/chrome/browser/chromeos/options/system_page_view.cc
+++ b/chrome/browser/chromeos/options/system_page_view.cc
@@ -126,11 +126,11 @@ class DateTimeSection : public SettingsPageSection,
           L"(GMT+%d) " : L"(GMT%d) "), hour_offset) + output;
     }
 
-    virtual std::wstring GetTimeZoneIDAt(int index) {
+    virtual std::string GetTimeZoneIDAt(int index) {
       icu::UnicodeString id;
       timezones_[index]->getID(id);
-      std::wstring output;
-      UTF16ToWide(id.getBuffer(), id.length(), &output);
+      std::string output;
+      UTF16ToUTF8(id.getBuffer(), id.length(), &output);
       return output;
     }
 
@@ -141,7 +141,7 @@ class DateTimeSection : public SettingsPageSection,
   };
 
   // Selects the timezone.
-  void SelectTimeZone(const std::wstring& id);
+  void SelectTimeZone(const std::string& id);
 
   // TimeZone combobox model.
   views::Combobox* timezone_combobox_;
@@ -184,12 +184,12 @@ void DateTimeSection::InitContents(GridLayout* layout) {
 
 void DateTimeSection::NotifyPrefChanged(const std::wstring* pref_name) {
   if (!pref_name || *pref_name == prefs::kTimeZone) {
-    std::wstring timezone = timezone_.GetValue();
+    std::string timezone = timezone_.GetValue();
     SelectTimeZone(timezone);
   }
 }
 
-void DateTimeSection::SelectTimeZone(const std::wstring& id) {
+void DateTimeSection::SelectTimeZone(const std::string& id) {
   for (int i = 0; i < timezone_combobox_model_.GetItemCount(); i++) {
     if (timezone_combobox_model_.GetTimeZoneIDAt(i) == id) {
       timezone_combobox_->SetSelectedItem(i);