Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc |
=================================================================== |
--- chrome/browser/chromeos/login/wizard_controller_browsertest.cc (revision 70736) |
+++ chrome/browser/chromeos/login/wizard_controller_browsertest.cc (working copy) |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include "app/l10n_util.h" |
+#include "base/utf_string_conversions.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chromeos/login/account_screen.h" |
#include "chrome/browser/chromeos/login/eula_view.h" |
@@ -80,13 +81,15 @@ |
EXPECT_EQ("en-US", g_browser_process->GetApplicationLocale()); |
EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage()); |
EXPECT_FALSE(base::i18n::IsRTL()); |
- const std::wstring en_str = l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE); |
+ const std::wstring en_str = |
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); |
chromeos::LanguageSwitchMenu::SwitchLanguage("fr"); |
EXPECT_EQ("fr", g_browser_process->GetApplicationLocale()); |
EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage()); |
EXPECT_FALSE(base::i18n::IsRTL()); |
- const std::wstring fr_str = l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE); |
+ const std::wstring fr_str = |
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); |
EXPECT_NE(en_str, fr_str); |
@@ -94,7 +97,8 @@ |
EXPECT_EQ("ar", g_browser_process->GetApplicationLocale()); |
EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage()); |
EXPECT_TRUE(base::i18n::IsRTL()); |
- const std::wstring ar_str = l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE); |
+ const std::wstring ar_str = |
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); |
EXPECT_NE(fr_str, ar_str); |
} |