Index: Source/web/tests/WebFrameTest.cpp |
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp |
index 32ecf1a46c2d059dc8b599180a729e3ebee284dd..0dd11957226bb663f2cd5f3f809ecfd5a8931602 100644 |
--- a/Source/web/tests/WebFrameTest.cpp |
+++ b/Source/web/tests/WebFrameTest.cpp |
@@ -292,15 +292,9 @@ void PrintTo(ParameterizedWebFrameTestConfig config, ::std::ostream* os) |
} |
} |
-#if OS(MACOSX) && ENABLE(OILPAN) |
-// FIXME(504655): RootLayerScrolls configuration crashes on Mac Oilpan bots. |
-INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Values( |
- ParameterizedWebFrameTestConfig::Default)); |
-#else |
INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Values( |
ParameterizedWebFrameTestConfig::Default, |
ParameterizedWebFrameTestConfig::RootLayerScrolls)); |
-#endif |
TEST_P(ParameterizedWebFrameTest, ContentText) |
{ |
@@ -2223,15 +2217,9 @@ protected: |
} |
}; |
-#if OS(MACOSX) && ENABLE(OILPAN) |
-// FIXME(504655): RootLayerScrolls configuration crashes on Mac Oilpan bots. |
-INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values( |
- ParameterizedWebFrameTestConfig::Default)); |
-#else |
INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values( |
ParameterizedWebFrameTestConfig::Default, |
ParameterizedWebFrameTestConfig::RootLayerScrolls)); |
-#endif |
TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth) |
{ |