FrameTestHelpers: support Settings-parameterized tests.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 170 matching lines @@
     }
 
 protected:
     std::string m_baseURL;
     FrameTestHelpers::TestWebViewClient m_mockWebViewClient;
 
 private:
     FrameTestHelpers::WebViewHelper m_helper;
 };
 
-typedef void (*SettingOverrideFunction)(WebSettings*);
-
-static void DefaultSettingOverride(WebSettings *)
-{
-}
-
 class ParameterizedVisualViewportTest
     : public VisualViewportTest
-    , public testing::WithParamInterface<SettingOverrideFunction> {
+    , public testing::WithParamInterface<FrameTestHelpers::SettingOverrideFunction> {
 public:
     void overrideSettings(WebSettings *settings) override
     {
         GetParam()(settings);
     }
 };
 
-static void RootLayerScrollsSettingOverride(WebSettings *settings)
-{
-    settings->setRootLayerScrolls(true);
-}
 INSTANTIATE_TEST_CASE_P(All, ParameterizedVisualViewportTest, ::testing::Values(
-    DefaultSettingOverride,
-    RootLayerScrollsSettingOverride));
+    FrameTestHelpers::DefaultSettingOverride,
+    FrameTestHelpers::RootLayerScrollsSettingOverride));
 
 // Test that resizing the VisualViewport works as expected and that resizing the
 // WebView resizes the VisualViewport.
 TEST_P(ParameterizedVisualViewportTest, TestResize)
 {
     initializeWithDesktopSettings();
     webViewImpl()->resize(IntSize(320, 240));
 
     navigateTo("about:blank");
     forceFullCompositingUpdate();
@@ skipping 1635 matching lines @@
     webViewImpl()->handleInputEvent(pinchUpdate);
 
     VisualViewport& visualViewport = webViewImpl()->page()->frameHost().visualViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 50), visualViewport.location());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0), frameView.scrollPositionDouble());
 }
 
 } // namespace