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, 5 insertions, 3 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 2df6969..77b700f 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -425,8 +425,10 @@ PrefService* InitializeLocalState(const CommandLine& parsed_command_line,
     // becomes our default language in the prefs.
     // Other platforms obey the system locale.
     std::wstring install_lang;
-    if (GoogleUpdateSettings::GetLanguage(&install_lang))
-      local_state->SetString(prefs::kApplicationLocale, install_lang);
+    if (GoogleUpdateSettings::GetLanguage(&install_lang)) {
+      local_state->SetString(prefs::kApplicationLocale,
+                             WideToASCII(install_lang));
+    }
 #endif  // defined(OS_WIN)
   }
 
@@ -990,7 +992,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
     g_browser_process->SetApplicationLocale(l10n_util::GetLocaleOverride());
 #else
     std::string app_locale = ResourceBundle::InitSharedInstance(
-        local_state->GetString(prefs::kApplicationLocale));
+        ASCIIToWide(local_state->GetString(prefs::kApplicationLocale)));
     g_browser_process->SetApplicationLocale(app_locale);
 
     FilePath resources_pack_path;