Convert ARRAYSIZE_UNSAFE -> arraysize in base/.

base/i18n/icu_string_conversions_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <math.h>
 #include <stdarg.h>
 
 #include <limits>
 #include <sstream>
 
@@ skipping 216 matching lines @@
   {"windows-874",
    "\xCA\xC7\xD1\xCA\xB4\xD5" "\xA4\xC3\xD1\xBA",
    OnStringConversionError::FAIL,
    true,
    L"\x0E2A\x0E27\x0E31\x0E2A\x0E14\x0E35"
    L"\x0E04\x0E23\x0e31\x0E1A",
    NULL},
 };
 
 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,
                      kConvertCodepageCases[i].codepage_name));
 
     std::wstring wide;
     bool success = CodepageToWide(kConvertCodepageCases[i].encoded,
                                   kConvertCodepageCases[i].codepage_name,
                                   kConvertCodepageCases[i].on_error,
                                   &wide);
@@ skipping 46 matching lines @@
   EXPECT_TRUE(WideToCodepage(L"a\xffffz", "iso-8859-1",
                              OnStringConversionError::SKIP, &encoded));
   EXPECT_STREQ("az", encoded.c_str());
 
   // Invalid codepages should fail.
   EXPECT_FALSE(WideToCodepage(L"Hello, world", "awesome-8571-2",
                               OnStringConversionError::SKIP, &encoded));
 }
 
 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,
                      kConvertCodepageCases[i].codepage_name));
 
     string16 utf16;
     bool success = CodepageToUTF16(kConvertCodepageCases[i].encoded,
                                    kConvertCodepageCases[i].codepage_name,
                                    kConvertCodepageCases[i].on_error,
                                    &utf16);
@@ skipping 33 matching lines @@
   {"foo-a\xcc\x88.html", "utf-8", true, "foo-\xc3\xa4.html"},
   {"\x95\x32\x82\x36\xD2\xBB", "gb18030", true, "\xF0\xA0\x80\x80\xE4\xB8\x80"},
   {"\xA7\x41\xA6\x6E", "big5", true, "\xE4\xBD\xA0\xE5\xA5\xBD"},
   // Windows-1258 does have a combining character at xD2 (which is U+0309).
   // The sequence of (U+00E2, U+0309) is also encoded as U+1EA9.
   {"foo\xE2\xD2", "windows-1258", true, "foo\xE1\xBA\xA9"},
   {"", "iso-8859-1", true, ""},
 };
 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,
                      kConvertAndNormalizeCases[i].codepage_name));
 
     bool success = ConvertToUtf8AndNormalize(
         kConvertAndNormalizeCases[i].encoded,
         kConvertAndNormalizeCases[i].codepage_name, &result);
     EXPECT_EQ(kConvertAndNormalizeCases[i].expected_success, success);
     EXPECT_EQ(kConvertAndNormalizeCases[i].expected_value, result);
   }
 }
 
 }  // namespace base