Index: Source/platform/weborigin/SecurityOriginTest.cpp |
diff --git a/Source/platform/weborigin/SecurityOriginTest.cpp b/Source/platform/weborigin/SecurityOriginTest.cpp |
index 57ffeff3082568cb9ce3bdaa1705acc1d513c727..8c9e36e1209df69fb0495c7bc6c9f167be46853a 100644 |
--- a/Source/platform/weborigin/SecurityOriginTest.cpp |
+++ b/Source/platform/weborigin/SecurityOriginTest.cpp |
@@ -44,7 +44,7 @@ TEST(SecurityOriginTest, InvalidPortsCreateUniqueOrigins) |
{ |
int ports[] = { -100, -1, MaxAllowedPort + 1, 1000000 }; |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(ports); ++i) { |
+ for (size_t i = 0; i < arraysize(ports); ++i) { |
RefPtr<SecurityOrigin> origin = SecurityOrigin::create("http", "example.com", ports[i]); |
EXPECT_TRUE(origin->isUnique()) << "Port " << ports[i] << " should have generated a unique origin."; |
} |
@@ -54,7 +54,7 @@ TEST(SecurityOriginTest, ValidPortsCreateNonUniqueOrigins) |
{ |
int ports[] = { 0, 80, 443, 5000, MaxAllowedPort }; |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(ports); ++i) { |
+ for (size_t i = 0; i < arraysize(ports); ++i) { |
RefPtr<SecurityOrigin> origin = SecurityOrigin::create("http", "example.com", ports[i]); |
EXPECT_FALSE(origin->isUnique()) << "Port " << ports[i] << " should not have generated a unique origin."; |
} |
@@ -124,7 +124,7 @@ TEST(SecurityOriginTest, CanAccessFeatureRequringSecureOrigin) |
{ false, "filesystem:ftp://evil:99/foo" }, |
}; |
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(inputs); ++i) { |
+ for (size_t i = 0; i < arraysize(inputs); ++i) { |
SCOPED_TRACE(i); |
RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(inputs[i].url); |
String errorMessage; |