Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures

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 84 matching lines @@
 {
     return os << "Context menu location: ["
         << data.mousePosition.x << ", " << data.mousePosition.y << "]";
 }
 }
 
 
 namespace {
 
 class VisualViewportTest
-    : public testing::Test
-    , public FrameTestHelpers::SettingOverrider {
+    : public testing::Test {
 public:
     VisualViewportTest()
         : m_baseURL("http://www.test.com/")
-        , m_helper(this)
     {
     }
 
-    void overrideSettings(WebSettings *settings) override
-    {
-    }
-
     void initializeWithDesktopSettings(void (*overrideSettingsFunc)(WebSettings*) = 0)
     {
         if (!overrideSettingsFunc)
             overrideSettingsFunc = &configureSettings;
         m_helper.initialize(true, nullptr, &m_mockWebViewClient, nullptr, overrideSettingsFunc);
         webViewImpl()->setDefaultPageScaleLimits(1, 4);
     }
 
     void initializeWithAndroidSettings(void (*overrideSettingsFunc)(WebSettings*) = 0)
     {
@@ skipping 53 matching lines @@
     }
 
 protected:
     std::string m_baseURL;
     FrameTestHelpers::TestWebViewClient m_mockWebViewClient;
 
 private:
     FrameTestHelpers::WebViewHelper m_helper;
 };
 
+typedef bool TestParamRootLayerScrolling;
 class ParameterizedVisualViewportTest
     : public VisualViewportTest
-    , public testing::WithParamInterface<FrameTestHelpers::SettingOverrideFunction> {
+    , public testing::WithParamInterface<TestParamRootLayerScrolling> {
 public:
-    void overrideSettings(WebSettings *settings) override
+    ParameterizedVisualViewportTest()
+        : m_originalRootLayerScrollingEnabled(RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+        , m_enableRootLayerScrolling(GetParam())
     {
-        GetParam()(settings);
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_enableRootLayerScrolling);
     }
+
+    ~ParameterizedVisualViewportTest()
+    {
+        CHECK_EQ(m_enableRootLayerScrolling, RuntimeEnabledFeatures::rootLayerScrollingEnabled());
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_originalRootLayerScrollingEnabled);
+    }
+
+private:
+    bool m_originalRootLayerScrollingEnabled;
+    bool m_enableRootLayerScrolling;

[esprehn, 2016/08/25 23:59:24]

again

 };
 
-INSTANTIATE_TEST_CASE_P(All, ParameterizedVisualViewportTest, ::testing::Values(
-    FrameTestHelpers::DefaultSettingOverride,
-    FrameTestHelpers::RootLayerScrollsSettingOverride));

[esprehn, 2016/08/25 23:59:24]

this doesn't seem better to copy pasta this all over

+INSTANTIATE_TEST_CASE_P(All, ParameterizedVisualViewportTest, ::testing::Bool());
 
 // 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 1711 matching lines @@
 
     EXPECT_POINT_EQ(
         DoublePoint(),
         frameView.layoutViewportScrollableArea()->scrollPositionDouble());
     EXPECT_EQ(600, scroller->scrollTop());
 
     RuntimeEnabledFeatures::setSetRootScrollerEnabled(wasRootScrollerEnabled);
 }
 
 } // namespace