FrameTestHelpers: support Settings-parameterized tests.

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 262 matching lines @@
         Element* element = frame->frame()->document()->getElementById(id);
         DCHECK(element);
         element->remove();
     }
 
     std::string m_baseURL;
     std::string m_notBaseURL;
     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)
 {
     registerMockedHttpURLLoad("iframes_test.html");
     registerMockedHttpURLLoad("visible_iframe.html");
     registerMockedHttpURLLoad("invisible_iframe.html");
     registerMockedHttpURLLoad("zero_sized_iframe.html");
 
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     webViewHelper.initializeAndLoad(m_baseURL + "iframes_test.html");
@@ skipping 1987 matching lines @@
             EXPECT_EQ(initialPageScaleFactor, webViewHelper.webViewImpl()->pageScaleFactor());
             EXPECT_EQ(expectedScrollOffset, webViewHelper.webViewImpl()->mainFrame()->scrollOffset());
             webViewHelper.resize(WebSize(viewportSize.width, viewportSize.height * 0.8f));
             EXPECT_EQ(initialPageScaleFactor, webViewHelper.webViewImpl()->pageScaleFactor());
             EXPECT_EQ(expectedScrollOffset, webViewHelper.webViewImpl()->mainFrame()->scrollOffset());
         }
     }
 };
 
 INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values(
-    ParameterizedWebFrameTestConfig::Default,
-    ParameterizedWebFrameTestConfig::RootLayerScrolls));
+    FrameTestHelpers::DefaultSettingOverride,
+    FrameTestHelpers::RootLayerScrollsSettingOverride));
 
 TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
 {
     // With width=device-width, pageScaleFactor is preserved across resizes as
     // long as the content adjusts according to the device-width.
     const char* url = "resize_scroll_mobile.html";
     const float initialPageScaleFactor = 1;
     const WebSize scrollOffset(0, 50);
     const WebSize viewportSize(120, 160);
     const bool shouldScaleRelativeToViewportWidth = true;
@@ skipping 5673 matching lines @@
         runPendingTasks();
         EXPECT_TRUE(callbackHelper.didComplete());
         return callbackHelper.stringValue();
     }
 
     FixedLayoutTestWebViewClient m_client;
     FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 INSTANTIATE_TEST_CASE_P(All, DeviceEmulationTest, ::testing::Values(
-    ParameterizedWebFrameTestConfig::Default,
-    ParameterizedWebFrameTestConfig::RootLayerScrolls));
+    FrameTestHelpers::DefaultSettingOverride,
+    FrameTestHelpers::RootLayerScrollsSettingOverride));
 
 TEST_P(DeviceEmulationTest, DeviceSizeInvalidatedOnResize)
 {
     WebDeviceEmulationParams params;
     params.screenPosition = WebDeviceEmulationParams::Mobile;
     m_webViewHelper.webView()->enableDeviceEmulation(params);
 
     testResize(WebSize(700, 500), "300x300");
     testResize(WebSize(710, 500), "400x300");
     testResize(WebSize(690, 500), "200x300");
@@ skipping 777 matching lines @@
     request.setRequestorOrigin(WebSecurityOrigin::createUnique());
     helper.webViewImpl()->mainFrame()->toWebLocalFrame()->loadRequest(request);
 
     // Normally, the result of the JS url replaces the existing contents on the
     // Document. However, if the JS triggers a navigation, the contents should
     // not be replaced.
     EXPECT_EQ("", toLocalFrame(helper.webViewImpl()->page()->mainFrame())->document()->documentElement()->innerText());
 }
 
 } // namespace blink