Convert ARRAYSIZE_UNSAFE -> arraysize in base/.

base/json/string_escape_unittest.cc

 // Copyright (c) 2013 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 "base/json/string_escape.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 TEST(JSONStringEscapeTest, EscapeUTF8) {
   const struct {
     const char* to_escape;
     const char* escaped;
   } cases[] = {
     {"\b\001aZ\"\\wee", "\\b\\u0001aZ\\\"\\\\wee"},
     {"a\b\f\n\r\t\v\1\\.\"z",
         "a\\b\\f\\n\\r\\t\\u000B\\u0001\\\\.\\\"z"},
     {"b\x0f\x7f\xf0\xff!",  // \xf0\xff is not a valid UTF-8 unit.
         "b\\u000F\x7F\xEF\xBF\xBD\xEF\xBF\xBD!"},
     {"c<>d", "c\\u003C>d"},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     const char* in_ptr = cases[i].to_escape;
     std::string in_str = in_ptr;
 
     std::string out;
     EscapeJSONString(in_ptr, false, &out);
     EXPECT_EQ(std::string(cases[i].escaped), out);
     EXPECT_TRUE(IsStringUTF8(out));
 
     out.erase();
     bool convert_ok = EscapeJSONString(in_str, false, &out);
@@ skipping 37 matching lines @@
     const char* escaped;
   } cases[] = {
     {L"b\uffb1\u00ff", "b\xEF\xBE\xB1\xC3\xBF"},
     {L"\b\001aZ\"\\wee", "\\b\\u0001aZ\\\"\\\\wee"},
     {L"a\b\f\n\r\t\v\1\\.\"z",
         "a\\b\\f\\n\\r\\t\\u000B\\u0001\\\\.\\\"z"},
     {L"b\x0f\x7f\xf0\xff!", "b\\u000F\x7F\xC3\xB0\xC3\xBF!"},
     {L"c<>d", "c\\u003C>d"},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     string16 in = WideToUTF16(cases[i].to_escape);
 
     std::string out;
     EscapeJSONString(in, false, &out);
     EXPECT_EQ(std::string(cases[i].escaped), out);
     EXPECT_TRUE(IsStringUTF8(out));
 
     out = GetQuotedJSONString(in);
     EXPECT_EQ("\"" + std::string(cases[i].escaped) + "\"", out);
     EXPECT_TRUE(IsStringUTF8(out));
@@ skipping 60 matching lines @@
 
 TEST(JSONStringEscapeTest, EscapeBytes) {
   const struct {
     const char* to_escape;
     const char* escaped;
   } cases[] = {
     {"b\x0f\x7f\xf0\xff!", "b\\u000F\\u007F\\u00F0\\u00FF!"},
     {"\xe5\xc4\x4f\x05\xb6\xfd\0", "\\u00E5\\u00C4O\\u0005\\u00B6\\u00FD"},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+  for (size_t i = 0; i < arraysize(cases); ++i) {
     std::string in = std::string(cases[i].to_escape);
     EXPECT_FALSE(IsStringUTF8(in));
 
     EXPECT_EQ(std::string(cases[i].escaped),
         EscapeBytesAsInvalidJSONString(in, false));
     EXPECT_EQ("\"" + std::string(cases[i].escaped) + "\"",
         EscapeBytesAsInvalidJSONString(in, true));
   }
 
   const char kEmbedNull[] = { '\xab', '\x39', '\0', '\x9f', '\xab' };
-  std::string in(kEmbedNull, ARRAYSIZE_UNSAFE(kEmbedNull));
+  std::string in(kEmbedNull, arraysize(kEmbedNull));
   EXPECT_FALSE(IsStringUTF8(in));
   EXPECT_EQ(std::string("\\u00AB9\\u0000\\u009F\\u00AB"),
             EscapeBytesAsInvalidJSONString(in, false));
 }
 
 }  // namespace base