Convert ARRAYSIZE_UNSAFE -> arraysize in net/.

net/base/filename_util_unittest.cc

 // Copyright 2014 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 "net/base/filename_util.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 165 matching lines @@
     {L"/Chinese/\x6240\x6709\x4e2d\x6587\x7f51\x9875.doc",
      "file:///Chinese/%E6%89%80%E6%9C%89%E4%B8%AD%E6%96%87%E7%BD"
          "%91%E9%A1%B5.doc"},
     {L"/plane1/\x1D400\x1D401.txt",  // Math alphabet "AB"
      "file:///plane1/%F0%9D%90%80%F0%9D%90%81.txt"},
 #endif
   };
 
   // First, we'll test that we can round-trip all of the above cases of URLs
   base::FilePath output;
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(round_trip_cases); i++) {
+  for (size_t i = 0; i < arraysize(round_trip_cases); i++) {
     // convert to the file URL
     GURL file_url(FilePathToFileURL(
                       WStringAsFilePath(round_trip_cases[i].file)));
     EXPECT_EQ(round_trip_cases[i].url, file_url.spec());
 
     // Back to the filename.
     EXPECT_TRUE(FileURLToFilePath(file_url, &output));
     EXPECT_EQ(round_trip_cases[i].file, FilePathAsWString(output));
   }
 
@@ skipping 24 matching lines @@
     {L"/c:/foo/bar.txt", "file:c:/foo/bar.txt"},
     // We get these wrong because GURL turns back slashes into forward
     // slashes.
     //{L"/foo%5Cbar.txt", "file://foo\\bar.txt"},
     //{L"/c|/foo%5Cbar.txt", "file:c|/foo\\bar.txt"},
     //{L"/foo%5Cbar.txt", "file://foo\\bar.txt"},
     //{L"/foo%5Cbar.txt", "file:////foo\\bar.txt"},
     //{L"/foo%5Cbar.txt", "file://foo\\bar.txt"},
 #endif
   };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_cases); i++) {
+  for (size_t i = 0; i < arraysize(url_cases); i++) {
     FileURLToFilePath(GURL(url_cases[i].url), &output);
     EXPECT_EQ(url_cases[i].file, FilePathAsWString(output));
   }
 
   // Unfortunately, UTF8ToWide discards invalid UTF8 input.
 #ifdef BUG_878908_IS_FIXED
   // Test that no conversion happens if the UTF-8 input is invalid, and that
   // the input is preserved in UTF-8
   const char invalid_utf8[] = "file:///d:/Blah/\xff.doc";
   const wchar_t invalid_wide[] = L"D:\\Blah\\\xff.doc";
@@ skipping 160 matching lines @@
       FILE_PATH_LITERAL("/bar.jpg")
     },
     {
       "image/jpeg",
       FILE_PATH_LITERAL("/bar.jpeg"),
       FILE_PATH_LITERAL("/bar.jpeg")
     },
 #endif  // !defined(OS_WIN)
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(safe_tests); ++i) {
+  for (size_t i = 0; i < arraysize(safe_tests); ++i) {
     base::FilePath file_path(safe_tests[i].filename);
     GenerateSafeFileName(safe_tests[i].mime_type, false, &file_path);
     EXPECT_EQ(safe_tests[i].expected_filename, file_path.value())
         << "Iteration " << i;
   }
 }
 
 TEST(FilenameUtilTest, GenerateFileName) {
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
   // This test doesn't run when the locale is not UTF-8 because some of the
@@ skipping 1221 matching lines @@
       "",
       "",
       "",
       "image/jpeg",
       L"foo\xe4",
       L"foo\xe4.txt"
     },
 #endif
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(selection_tests); ++i)
+  for (size_t i = 0; i < arraysize(selection_tests); ++i)
     RunGenerateFileNameTestCase(&selection_tests[i]);
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(generation_tests); ++i)
+  for (size_t i = 0; i < arraysize(generation_tests); ++i)
     RunGenerateFileNameTestCase(&generation_tests[i]);
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(generation_tests); ++i) {
+  for (size_t i = 0; i < arraysize(generation_tests); ++i) {
     GenerateFilenameCase test_case = generation_tests[i];
     test_case.referrer_charset = "GBK";
     RunGenerateFileNameTestCase(&test_case);
   }
 }
 
 }  // namespace net