Use scoped REF test helpers for SPv2 and RootLayerScrolls.

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // Copyright 2016 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 "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/trees/clip_node.h"
 #include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "cc/trees/scroll_node.h"
 #include "cc/trees/transform_node.h"
-#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/paint/EffectPaintPropertyNode.h"
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/graphics/paint/ScrollPaintPropertyNode.h"
 #include "platform/testing/PaintPropertyTestHelpers.h"
 #include "platform/testing/PictureMatchers.h"
+#include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/TestPaintArtifact.h"
 #include "platform/testing/WebLayerTreeViewImplForTesting.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <memory>
 
 namespace blink {
 namespace {
 
 using ::blink::testing::createOpacityOnlyEffect;
@@ skipping 18 matching lines @@
   WebLayerTreeViewWithCompositorFrameSink(const cc::LayerTreeSettings& settings)
       : WebLayerTreeViewImplForTesting(settings) {}
 
   // cc::LayerTreeHostClient
   void RequestNewCompositorFrameSink() override {
     layerTreeHost()->SetCompositorFrameSink(
         cc::FakeCompositorFrameSink::Create3d());
   }
 };
 
-class PaintArtifactCompositorTestWithPropertyTrees : public ::testing::Test {
+class PaintArtifactCompositorTestWithPropertyTrees
+    : public ::testing::Test,
+      private ScopedSlimmingPaintV2ForTest {
  protected:
   PaintArtifactCompositorTestWithPropertyTrees()
-      : m_taskRunner(new base::TestSimpleTaskRunner),
+      : ScopedSlimmingPaintV2ForTest(true),
+        m_taskRunner(new base::TestSimpleTaskRunner),
         m_taskRunnerHandle(m_taskRunner) {}
 
   void SetUp() override {
-    RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
-
     // Delay constructing the compositor until after the feature is set.
     m_paintArtifactCompositor = PaintArtifactCompositor::create();
     m_paintArtifactCompositor->enableExtraDataForTesting();
 
     cc::LayerTreeSettings settings =
         WebLayerTreeViewImplForTesting::defaultLayerTreeSettings();
     settings.single_thread_proxy_scheduler = false;
     settings.use_layer_lists = true;
     m_webLayerTreeView =
         WTF::makeUnique<WebLayerTreeViewWithCompositorFrameSink>(settings);
     m_webLayerTreeView->setRootLayer(*m_paintArtifactCompositor->getWebLayer());
   }
 
-  void TearDown() override { m_featuresBackup.restore(); }
-
   const cc::PropertyTrees& propertyTrees() {
     return *m_webLayerTreeView->layerTreeHost()
                 ->GetLayerTree()
                 ->property_trees();
   }
 
   const cc::TransformNode& transformNode(const cc::Layer* layer) {
     return *propertyTrees().transform_tree.Node(layer->transform_tree_index());
   }
 
   void update(const PaintArtifact& artifact) {
     m_paintArtifactCompositor->update(artifact, nullptr, false);
     m_webLayerTreeView->layerTreeHost()->LayoutAndUpdateLayers();
   }
 
   cc::Layer* rootLayer() { return m_paintArtifactCompositor->rootLayer(); }
 
   size_t contentLayerCount() {
     return m_paintArtifactCompositor->getExtraDataForTesting()
         ->contentLayers.size();
   }
 
   cc::Layer* contentLayerAt(unsigned index) {
     return m_paintArtifactCompositor->getExtraDataForTesting()
         ->contentLayers[index]
         .get();
   }
 
  private:
-  RuntimeEnabledFeatures::Backup m_featuresBackup;
   std::unique_ptr<PaintArtifactCompositor> m_paintArtifactCompositor;
   scoped_refptr<base::TestSimpleTaskRunner> m_taskRunner;
   base::ThreadTaskRunnerHandle m_taskRunnerHandle;
   std::unique_ptr<WebLayerTreeViewWithCompositorFrameSink> m_webLayerTreeView;
 };
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, EmptyPaintArtifact) {
   PaintArtifact emptyArtifact;
   update(emptyArtifact);
   EXPECT_TRUE(rootLayer()->children().empty());
@@ skipping 589 matching lines @@
             scrollTree.current_scroll_offset(contentLayerAt(1)->id()));
 
   EXPECT_TRUE(scrollNodeA.main_thread_scrolling_reasons &
               MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
   EXPECT_FALSE(scrollNodeB.main_thread_scrolling_reasons &
                MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
 }
 
 }  // namespace
 }  // namespace blink