Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
index 6b7dc1cb821a62c90cf1536adab0b1cd25e735ca..62fccf65fbd0c1a073a38a020c71d1dbf536a377 100644 |
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
@@ -1419,7 +1419,7 @@ TEST_P(ParameterizedWebFrameTest, SmallPermanentInitialPageScaleFactorIsClobbere |
"viewport-target-densitydpi-device-and-fixed-width.html" |
}; |
float pageScaleFactors[] = { 0.5f, 1.0f }; |
- for (size_t i = 0; i < ARRAY_SIZE(pages); ++i) |
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) |
registerMockedHttpURLLoad(pages[i]); |
FixedLayoutTestWebViewClient client; |
@@ -1428,7 +1428,7 @@ TEST_P(ParameterizedWebFrameTest, SmallPermanentInitialPageScaleFactorIsClobbere |
int viewportHeight = 300; |
float enforcedPageScaleFactor = 0.75f; |
- for (size_t i = 0; i < ARRAY_SIZE(pages); ++i) { |
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) { |
for (int quirkEnabled = 0; quirkEnabled <= 1; ++quirkEnabled) { |
FrameTestHelpers::WebViewHelper webViewHelper(this); |
webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, 0, &client, enableViewportSettings); |
@@ -1437,7 +1437,7 @@ TEST_P(ParameterizedWebFrameTest, SmallPermanentInitialPageScaleFactorIsClobbere |
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor); |
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight)); |
- float expectedPageScaleFactor = quirkEnabled && i < ARRAY_SIZE(pageScaleFactors) ? pageScaleFactors[i] : enforcedPageScaleFactor; |
+ float expectedPageScaleFactor = quirkEnabled && i < WTF_ARRAY_LENGTH(pageScaleFactors) ? pageScaleFactors[i] : enforcedPageScaleFactor; |
EXPECT_EQ(expectedPageScaleFactor, webViewHelper.webView()->pageScaleFactor()); |
} |
} |
@@ -2031,7 +2031,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiHigh) |
int viewportWidth = 640; |
int viewportHeight = 480; |
- for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { |
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) { |
float deviceScaleFactor = deviceScaleFactors[i]; |
float deviceDpi = deviceScaleFactor * 160.0f; |
client.m_screenInfo.deviceScaleFactor = deviceScaleFactor; |
@@ -2062,7 +2062,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice) |
int viewportWidth = 640; |
int viewportHeight = 480; |
- for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { |
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) { |
client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; |
FrameTestHelpers::WebViewHelper webViewHelper(this); |
@@ -2088,7 +2088,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth) |
int viewportWidth = 640; |
int viewportHeight = 480; |
- for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) { |
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) { |
client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i]; |
FrameTestHelpers::WebViewHelper webViewHelper(this); |