Convert ARRAYSIZE_UNSAFE -> arraysize in base/.

base/i18n/rtl_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 "base/i18n/rtl.h"
 
 #include <algorithm>
 
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
@@ skipping 78 matching lines @@
 #if defined(WCHAR_T_IS_UTF32)
       L" ! \x10401" L"abc 123",
 #elif defined(WCHAR_T_IS_UTF16)
       L" ! \xd801\xdc01" L"abc 123",
 #else
 #error wchar_t should be either UTF-16 or UTF-32
 #endif
       LEFT_TO_RIGHT },
    };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i)
+  for (size_t i = 0; i < arraysize(cases); ++i)
     EXPECT_EQ(cases[i].direction,
               GetFirstStrongCharacterDirection(WideToUTF16(cases[i].text)));
 }
 
 
 // Note that the cases with LRE, LRO, RLE and RLO are invalid for
 // GetLastStrongCharacterDirection because they should be followed by PDF
 // character.
 TEST_F(RTLTest, GetLastStrongCharacterDirection) {
   struct {
@@ skipping 41 matching lines @@
 #if defined(WCHAR_T_IS_UTF32)
        L"abc 123" L" ! \x10401 !",
 #elif defined(WCHAR_T_IS_UTF16)
        L"abc 123" L" ! \xd801\xdc01 !",
 #else
 #error wchar_t should be either UTF-16 or UTF-32
 #endif
       LEFT_TO_RIGHT },
    };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i)
+  for (size_t i = 0; i < arraysize(cases); ++i)
     EXPECT_EQ(cases[i].direction,
               GetLastStrongCharacterDirection(WideToUTF16(cases[i].text)));
 }
 
 TEST_F(RTLTest, GetStringDirection) {
   struct {
     const wchar_t* text;
     TextDirection direction;
   } cases[] = {
     // Test pure LTR string.
@@ skipping 57 matching lines @@
 #if defined(WCHAR_T_IS_UTF32)
       L" ! \x10401" L"abc 123",
 #elif defined(WCHAR_T_IS_UTF16)
       L" ! \xd801\xdc01" L"abc 123",
 #else
 #error wchar_t should be either UTF-16 or UTF-32
 #endif
       LEFT_TO_RIGHT },
    };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i)
+  for (size_t i = 0; i < arraysize(cases); ++i)
     EXPECT_EQ(cases[i].direction,
               GetStringDirection(WideToUTF16(cases[i].text)));
 }
 
 TEST_F(RTLTest, WrapPathWithLTRFormatting) {
   const wchar_t* cases[] = {
     // Test common path, such as "c:\foo\bar".
     L"c:/foo/bar",
     // Test path with file name, such as "c:\foo\bar\test.jpg".
     L"c:/foo/bar/test.jpg",
@@ skipping 98 matching lines @@
     { L"\x05d0" L"abc.txt",      true,  true },
     { L"abc\x05d0\x05d1",        false, true },
     { L"abc\x05d0\x05d1.jpg",    false, true },
   };
 
   const bool was_rtl = IsRTL();
 
   for (size_t i = 0; i < 2; ++i) {
     // Toggle the application default text direction (to try each direction).
     SetRTL(!IsRTL());
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+    for (size_t i = 0; i < arraysize(cases); ++i) {
       string16 input = WideToUTF16(cases[i].path);
       string16 output = GetDisplayStringInLTRDirectionality(input);
       // Test the expected wrapping behavior for the current UI directionality.
       if (IsRTL() ? cases[i].wrap_rtl : cases[i].wrap_ltr)
         EXPECT_NE(output, input);
       else
         EXPECT_EQ(output, input);
     }
   }
 
@@ skipping 63 matching lines @@
       EXPECT_EQ(test_case, adjusted_string) << " for test case [" << test_case
                                             << "] with IsRTL() == " << IsRTL();
     }
   }
 
   EXPECT_EQ(was_rtl, IsRTL());
 }
 
 }  // namespace i18n
 }  // namespace base