Remove wstrings from l10n_util/ResourceBundle locale functions.

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

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

5 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index c5117a4..4d621bf 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -856,7 +856,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
     // On a POSIX OS other than ChromeOS, the parameter that is passed to the
     // method InitSharedInstance is ignored.
     std::string app_locale = ResourceBundle::InitSharedInstance(
-        ASCIIToWide(local_state->GetString(prefs::kApplicationLocale)));
+        local_state->GetString(prefs::kApplicationLocale));
     g_browser_process->SetApplicationLocale(app_locale);
 
     FilePath resources_pack_path;
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index 3123a36..5aa5999 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -91,7 +91,7 @@ class BrowserMainPartsMac : public BrowserMainPartsPosix {
 
       // Before we load the nib, we need to start up the resource bundle so we
       // have the strings avaiable for localization.
-      std::wstring pref_locale;
+      std::string pref_locale;
       // TODO(markusheintz): Read preference pref::kApplicationLocale in order
       // to enforce the application locale.
       ResourceBundle::InitSharedInstance(pref_locale);
diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index 2c327270..c7b3e7e 100644
--- a/chrome/browser/chromeos/input_method/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
@@ -1053,7 +1053,7 @@ int main(int argc, char** argv) {
   // ResourceBundle code now ignores the --Lang flag.
   // In order to support the --Lang flag here the preference
   // prefs::kApplicationLocale must be read and passed instead of L"en-US".
-  ResourceBundle::InitSharedInstance(L"en-US");
+  ResourceBundle::InitSharedInstance("en-US");
 
   // Write logs to a file for debugging, if --logtofile=FILE_NAME is given.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc
index d32a0a3..884583b 100644
--- a/chrome/browser/chromeos/login/language_switch_menu.cc
+++ b/chrome/browser/chromeos/login/language_switch_menu.cc
@@ -96,7 +96,7 @@ void LanguageSwitchMenu::SwitchLanguage(const std::string& locale) {
     prefs->SavePersistentPrefs();
 
     // Switch the locale.
-    ResourceBundle::ReloadSharedInstance(UTF8ToWide(locale));
+    ResourceBundle::ReloadSharedInstance(locale);
 
     // Enable the keyboard layouts that are necessary for the new locale.
     chromeos::input_method::EnableInputMethods(
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 4dccf67..8d3ed53 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -829,7 +829,7 @@ void ShowLoginWizard(const std::string& first_screen_name,
       locale = controller->GetCustomization()->initial_locale();
       LOG(INFO) << "initial locale: " << locale;
       if (!locale.empty()) {
-        ResourceBundle::ReloadSharedInstance(UTF8ToWide(locale));
+        ResourceBundle::ReloadSharedInstance(locale);
       }
     }
   }