Updates to base unittests so they run correctly in libchrome on Android
Parallel change to https://android-review.googlesource.com/#/c/163293/
(does not include changes being made to base/command_line_unittest
that are fixing temporary runner issues, since the runner is fine here)
BUG= 22884411, 22947438
Review URL: https://codereview.chromium.org/1273243002
Cr-Commit-Position: refs/heads/master@{#343126}
diff --git a/base/strings/sys_string_conversions_unittest.cc b/base/strings/sys_string_conversions_unittest.cc
index 0cdd428..90c4767e 100644
--- a/base/strings/sys_string_conversions_unittest.cc
+++ b/base/strings/sys_string_conversions_unittest.cc
@@ -76,7 +76,7 @@
TEST(SysStrings, SysWideToNativeMB) {
#if !defined(SYSTEM_NATIVE_UTF8)
- ScopedLocale locale("en_US.utf-8");
+ ScopedLocale locale("en_US.UTF-8");
#endif
EXPECT_EQ("Hello, world", SysWideToNativeMB(L"Hello, world"));
EXPECT_EQ("\xe4\xbd\xa0\xe5\xa5\xbd", SysWideToNativeMB(L"\x4f60\x597d"));
@@ -108,7 +108,7 @@
// We assume the test is running in a UTF8 locale.
TEST(SysStrings, SysNativeMBToWide) {
#if !defined(SYSTEM_NATIVE_UTF8)
- ScopedLocale locale("en_US.utf-8");
+ ScopedLocale locale("en_US.UTF-8");
#endif
EXPECT_EQ(L"Hello, world", SysNativeMBToWide("Hello, world"));
EXPECT_EQ(L"\x4f60\x597d", SysNativeMBToWide("\xe4\xbd\xa0\xe5\xa5\xbd"));
@@ -164,7 +164,7 @@
TEST(SysStrings, SysNativeMBAndWide) {
#if !defined(SYSTEM_NATIVE_UTF8)
- ScopedLocale locale("en_US.utf-8");
+ ScopedLocale locale("en_US.UTF-8");
#endif
for (size_t i = 0; i < arraysize(kConvertRoundtripCases); ++i) {
std::wstring wide = kConvertRoundtripCases[i];
