Index: base/i18n/icu_string_conversions_unittest.cc |
diff --git a/base/i18n/icu_string_conversions_unittest.cc b/base/i18n/icu_string_conversions_unittest.cc |
index 04c3b92b6d0866e0114be10b35deb96c5d1b0944..107e24096e4a734ba0956a58c8fee31e2455c76d 100644 |
--- a/base/i18n/icu_string_conversions_unittest.cc |
+++ b/base/i18n/icu_string_conversions_unittest.cc |
@@ -234,7 +234,7 @@ static const struct { |
}; |
TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndWide) { |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kConvertCodepageCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kConvertCodepageCases); ++i) { |
SCOPED_TRACE(base::StringPrintf( |
"Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i, |
kConvertCodepageCases[i].encoded, |
@@ -301,7 +301,7 @@ TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndWide) { |
} |
TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndUTF16) { |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kConvertCodepageCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kConvertCodepageCases); ++i) { |
SCOPED_TRACE(base::StringPrintf( |
"Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i, |
kConvertCodepageCases[i].encoded, |
@@ -355,7 +355,7 @@ static const struct { |
}; |
TEST(ICUStringConversionsTest, ConvertToUtf8AndNormalize) { |
std::string result; |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kConvertAndNormalizeCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kConvertAndNormalizeCases); ++i) { |
SCOPED_TRACE(base::StringPrintf( |
"Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i, |
kConvertAndNormalizeCases[i].encoded, |