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, 2 insertions, 2 deletions

diff --git a/chrome/browser/default_encoding_combo_model.cc b/chrome/browser/default_encoding_combo_model.cc
index 7db6cce..83477b8 100644
--- a/chrome/browser/default_encoding_combo_model.cc
+++ b/chrome/browser/default_encoding_combo_model.cc
@@ -39,9 +39,9 @@ int DefaultEncodingComboboxModel::GetSelectedEncodingIndex(Profile* profile) {
   current_encoding_string.Init(prefs::kDefaultCharset,
                                profile->GetPrefs(),
                                NULL);
-  const std::wstring current_encoding = current_encoding_string.GetValue();
+  const std::string current_encoding = current_encoding_string.GetValue();
   for (int i = 0; i < GetItemCount(); ++i) {
-    if (GetEncodingCharsetByIndex(i) == WideToASCII(current_encoding))
+    if (GetEncodingCharsetByIndex(i) == current_encoding)
       return i;
   }