Convert ARRAYSIZE_UNSAFE -> arraysize in net/.

net/base/mime_util_unittest.cc

 // Copyright (c) 2012 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/basictypes.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/mime_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 15 matching lines @@
     { FILE_PATH_LITERAL("pjpeg"), "image/jpeg", true },
 #if defined(OS_ANDROID)
     { FILE_PATH_LITERAL("m3u8"), "application/x-mpegurl", true },
 #endif
     { FILE_PATH_LITERAL("not an extension / for sure"), "", false },
   };
 
   std::string mime_type;
   bool rv;
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     rv = GetMimeTypeFromExtension(tests[i].extension, &mime_type);
     EXPECT_EQ(tests[i].valid, rv);
     if (rv)
       EXPECT_EQ(tests[i].mime_type, mime_type);
   }
 }
 
 TEST(MimeUtilTest, FileTest) {
   const struct {
     const base::FilePath::CharType* file_path;
     const char* mime_type;
     bool valid;
   } tests[] = {
     { FILE_PATH_LITERAL("c:\\foo\\bar.css"), "text/css", true },
     { FILE_PATH_LITERAL("c:\\blah"), "", false },
     { FILE_PATH_LITERAL("/usr/local/bin/mplayer"), "", false },
     { FILE_PATH_LITERAL("/home/foo/bar.css"), "text/css", true },
     { FILE_PATH_LITERAL("/blah."), "", false },
     { FILE_PATH_LITERAL("c:\\blah."), "", false },
   };
 
   std::string mime_type;
   bool rv;
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     rv = GetMimeTypeFromFile(base::FilePath(tests[i].file_path),
                                   &mime_type);
     EXPECT_EQ(tests[i].valid, rv);
     if (rv)
       EXPECT_EQ(tests[i].mime_type, mime_type);
   }
 }
 
 TEST(MimeUtilTest, LookupTypes) {
   EXPECT_FALSE(IsUnsupportedTextMimeType("text/banana"));
@@ skipping 195 matching lines @@
     { "avc1.42E01E, mp4a.40.2",     2, { "avc1",   "mp4a" }   },
     { "\"mp4v.20.240, mp4a.40.2\"", 2, { "mp4v",   "mp4a" }   },
     { "mp4v.20.8, samr",            2, { "mp4v",   "samr" }   },
     { "\"theora, vorbis\"",         2, { "theora", "vorbis" } },
     { "",                           0, { }                    },
     { "\"\"",                       0, { }                    },
     { "\"   \"",                    0, { }                    },
     { ",",                          2, { "", "" }             },
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     std::vector<std::string> codecs_out;
     ParseCodecString(tests[i].original, &codecs_out, true);
     ASSERT_EQ(tests[i].expected_size, codecs_out.size());
     for (size_t j = 0; j < tests[i].expected_size; ++j)
       EXPECT_EQ(tests[i].results[j], codecs_out[j]);
   }
 
   // Test without stripping the codec type.
   std::vector<std::string> codecs_out;
   ParseCodecString("avc1.42E01E, mp4a.40.2", &codecs_out, false);
@@ skipping 106 matching lines @@
     { "video/*",    6, "mp4" },
 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS)
     { "video/*",    6, "mpg" },
 #else
     { "video/*",    6, "mpeg" },
 #endif
     { "audio/*",    6, "oga" },
     { "aUDIo/*",    6, "wav" },
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
+  for (size_t i = 0; i < arraysize(tests); ++i) {
     std::vector<base::FilePath::StringType> extensions;
     GetExtensionsForMimeType(tests[i].mime_type, &extensions);
     ASSERT_TRUE(tests[i].min_expected_size <= extensions.size());
 
     if (!tests[i].contained_result)
       continue;
 
     bool found = false;
     for (size_t j = 0; !found && j < extensions.size(); ++j) {
 #if defined(OS_WIN)
@@ skipping 38 matching lines @@
   std::string post_data;
   AddMultipartValueForUpload("value name", "value", "boundary",
                              "content type", &post_data);
   AddMultipartValueForUpload("value name", "value", "boundary",
                              "", &post_data);
   AddMultipartFinalDelimiterForUpload("boundary", &post_data);
   EXPECT_STREQ(ref_output, post_data.c_str());
 }
 
 }  // namespace net