Index: content/browser/fileapi/external_mount_points_unittest.cc |
diff --git a/content/browser/fileapi/external_mount_points_unittest.cc b/content/browser/fileapi/external_mount_points_unittest.cc |
index c55d85415e187b0d28a22b5abcb5668762bdec79..447eb7348a7a85c687620180b1795736c35a1de3 100644 |
--- a/content/browser/fileapi/external_mount_points_unittest.cc |
+++ b/content/browser/fileapi/external_mount_points_unittest.cc |
@@ -106,7 +106,7 @@ TEST(ExternalMountPointsTest, AddMountPoint) { |
}; |
// Test adding mount points. |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kTestCases); ++i) { |
EXPECT_EQ( |
kTestCases[i].success, |
mount_points->RegisterFileSystem(kTestCases[i].name, |
@@ -118,7 +118,7 @@ TEST(ExternalMountPointsTest, AddMountPoint) { |
} |
// Test that final mount point presence state is as expected. |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kTestCases); ++i) { |
base::FilePath found_path; |
EXPECT_EQ(kTestCases[i].registered_path != NULL, |
mount_points->GetRegisteredPath(kTestCases[i].name, &found_path)) |
@@ -214,7 +214,7 @@ TEST(ExternalMountPointsTest, GetVirtualPath) { |
#endif |
}; |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kTestCases); ++i) { |
// Initialize virtual path with a value. |
base::FilePath virtual_path(DRIVE FPL("/mount")); |
base::FilePath local_path(kTestCases[i].local_path); |
@@ -345,7 +345,7 @@ TEST(ExternalMountPointsTest, CreateCrackedFileSystemURL) { |
#endif |
}; |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kTestCases); ++i) { |
FileSystemURL cracked = mount_points->CreateCrackedFileSystemURL( |
kTestOrigin, |
storage::kFileSystemTypeExternal, |
@@ -439,7 +439,7 @@ TEST(ExternalMountPointsTest, CrackVirtualPath) { |
#endif |
}; |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) { |
+ for (size_t i = 0; i < arraysize(kTestCases); ++i) { |
std::string cracked_name; |
storage::FileSystemType cracked_type; |
std::string cracked_id; |