FrameTestHelpers: support Settings-parameterized tests.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

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 12fa42170efcdce20439f7fbddd4b50aa80fb6ec..5963644179135bceea66a9bd7e796c0e2dde04f4 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -280,45 +280,21 @@ protected:
     std::string m_chromeURL;
 };
 
-enum ParameterizedWebFrameTestConfig {
-    Default,
-    RootLayerScrolls
-};
-
 class ParameterizedWebFrameTest
     : public WebFrameTest
-    , public ::testing::WithParamInterface<ParameterizedWebFrameTestConfig>
+    , public ::testing::WithParamInterface<FrameTestHelpers::SettingOverrideFunction>
     , public FrameTestHelpers::SettingOverrider {
 public:
 
-    void overrideSettings(WebSettings* settings)
+    void overrideSettings(WebSettings *settings) override
     {
-        switch (GetParam()) {
-        case Default:
-            break;
-        case RootLayerScrolls:
-            settings->setRootLayerScrolls(true);
-            break;
-        }
+        GetParam()(settings);
     }
 };
 
-// Friendly string for gtest failure messages.
-void PrintTo(ParameterizedWebFrameTestConfig config, ::std::ostream* os)
-{
-    switch (config) {
-    case Default:
-        *os << "Default";
-        break;
-    case RootLayerScrolls:
-        *os << "RootLayerScrolls";
-        break;
-    }
-}
-
 INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Values(
-    ParameterizedWebFrameTestConfig::Default,
-    ParameterizedWebFrameTestConfig::RootLayerScrolls));
+    FrameTestHelpers::DefaultSettingOverride,
+    FrameTestHelpers::RootLayerScrollsSettingOverride));
 
 TEST_P(ParameterizedWebFrameTest, ContentText)
 {
@@ -2326,8 +2302,8 @@ protected:
 };
 
 INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values(
-    ParameterizedWebFrameTestConfig::Default,
-    ParameterizedWebFrameTestConfig::RootLayerScrolls));
+    FrameTestHelpers::DefaultSettingOverride,
+    FrameTestHelpers::RootLayerScrollsSettingOverride));
 
 TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
 {
@@ -8021,8 +7997,8 @@ protected:
 };
 
 INSTANTIATE_TEST_CASE_P(All, DeviceEmulationTest, ::testing::Values(
-    ParameterizedWebFrameTestConfig::Default,
-    ParameterizedWebFrameTestConfig::RootLayerScrolls));
+    FrameTestHelpers::DefaultSettingOverride,
+    FrameTestHelpers::RootLayerScrollsSettingOverride));
 
 TEST_P(DeviceEmulationTest, DeviceSizeInvalidatedOnResize)
 {