Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures

third_party/WebKit/Source/core/frame/FrameViewTest.cpp

 // Copyright 2015 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/FrameView.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutObject.h"
@@ skipping 20 matching lines @@
 
     // ChromeClient
     MOCK_METHOD1(didPaint, void(const PaintArtifact&));
     MOCK_METHOD2(attachRootGraphicsLayer, void(GraphicsLayer*, LocalFrame* localRoot));
     MOCK_METHOD2(setToolTip, void(const String&, TextDirection));
 
     void scheduleAnimation(Widget*) override { m_hasScheduledAnimation = true; }
     bool m_hasScheduledAnimation;
 };
 
+typedef bool TestParamRootLayerScrolling;
 class FrameViewTestBase
     : public testing::Test
-    , public testing::WithParamInterface<FrameSettingOverrideFunction> {
+    , public testing::WithParamInterface<TestParamRootLayerScrolling> {
 protected:
     FrameViewTestBase()
         : m_chromeClient(new MockChromeClient)
-    { }
+        , m_originalRootLayerScrollingEnabled(RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+        , m_enableRootLayerScrolling(GetParam())
+    {
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_enableRootLayerScrolling);
+    }
 
     ~FrameViewTestBase()
     {
         testing::Mock::VerifyAndClearExpectations(&chromeClient());
+        CHECK_EQ(m_enableRootLayerScrolling, RuntimeEnabledFeatures::rootLayerScrollingEnabled());
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_originalRootLayerScrollingEnabled);
     }
 
     void SetUp() override
     {
         Page::PageClients clients;
         fillWithEmptyClients(clients);
         clients.chromeClient = m_chromeClient.get();
         m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &clients);
         m_pageHolder->page().settings().setAcceleratedCompositingEnabled(true);
-        if (GetParam())
-            (*GetParam())(m_pageHolder->page().settings());
+    }
+
+    void TearDown() override
+    {
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(GetParam());

[skobes, 2016/08/21 14:21:21]

Why is this in TearDown?

[trchen, 2016/08/24 01:01:55]

Whoops, probably a mis-paste. Deleted.

     }
 
     Document& document() { return m_pageHolder->document(); }
     MockChromeClient& chromeClient() { return *m_chromeClient; }
 
 private:
     Persistent<MockChromeClient> m_chromeClient;
     std::unique_ptr<DummyPageHolder> m_pageHolder;
+    bool m_originalRootLayerScrollingEnabled;
+    bool m_enableRootLayerScrolling;
 };
 
 class FrameViewTest : public FrameViewTestBase {
 protected:
     FrameViewTest()
     {
         EXPECT_CALL(chromeClient(), attachRootGraphicsLayer(_, _)).Times(AnyNumber());
     }
 };
 
@@ skipping 16 matching lines @@
 
     void TearDown() override
     {
         m_featuresBackup.restore();
     }
 
 private:
     RuntimeEnabledFeatures::Backup m_featuresBackup;
 };
 
-INSTANTIATE_TEST_CASE_P(All, FrameViewTest, ::testing::Values(
-    nullptr,
-    &RootLayerScrollsFrameSettingOverride));
-
-INSTANTIATE_TEST_CASE_P(All, FrameViewSlimmingPaintV2Test, ::testing::Values(
-    nullptr,
-    &RootLayerScrollsFrameSettingOverride));
+INSTANTIATE_TEST_CASE_P(All, FrameViewTest, ::testing::Bool());
+INSTANTIATE_TEST_CASE_P(All, FrameViewSlimmingPaintV2Test, ::testing::Bool());
 
 // These tests ensure that FrameView informs the ChromeClient of changes to the
 // paint artifact so that they can be shown to the user (e.g. via the
 // compositor).
 TEST_P(FrameViewSlimmingPaintV2Test, PaintOnce)
 {
     EXPECT_CALL(chromeClient(), didPaint(_));
     document().body()->setInnerHTML("Hello world", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
 }
@@ skipping 38 matching lines @@
 {
     document().body()->setInnerHTML("<div style='width:1000px;height:1000px'></div>", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
 
     EXPECT_CALL(chromeClient(), setToolTip(String(), _));
     document().view()->layoutViewportScrollableArea()->setScrollPosition(DoublePoint(1, 1), UserScroll);
 }
 
 } // namespace
 } // namespace blink