| Index: ui/base/l10n/l10n_util_unittest.cc
|
| diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc
|
| index ef530fa4e48458c37c121bd5b369a4f98eec60d8..caf8184c56d6bc1f6e1252868f0b530d7c4aabd4 100644
|
| --- a/ui/base/l10n/l10n_util_unittest.cc
|
| +++ b/ui/base/l10n/l10n_util_unittest.cc
|
| @@ -332,7 +332,7 @@ void CheckUiDisplayNameForLocale(const std::string& locale,
|
|
|
| bool rtl_direction = true;
|
| for (size_t i = 0; i < result.length() - 1; i++) {
|
| - char16 ch = result.at(i);
|
| + base::char16 ch = result.at(i);
|
| switch (ch) {
|
| case base::i18n::kLeftToRightMark:
|
| case base::i18n::kLeftToRightEmbeddingMark:
|
| @@ -388,7 +388,7 @@ TEST_F(L10nUtilTest, GetDisplayNameForLocale) {
|
|
|
| // ToUpper and ToLower should work with embedded NULLs.
|
| const size_t length_with_null = 4;
|
| - char16 buf_with_null[length_with_null] = { 0, 'a', 0, 'b' };
|
| + base::char16 buf_with_null[length_with_null] = { 0, 'a', 0, 'b' };
|
| base::string16 string16_with_null(buf_with_null, length_with_null);
|
|
|
| base::string16 upper_with_null = base::i18n::ToUpper(string16_with_null);
|
|
|