Use scoped runtime features in tests.

Make sure RuntimeEnabledFeatures are reset properly in tests.

Change-Id: I13541aac18b6c5aa68753fdca560c8d8da0703a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1771968Reviewed-by: Xiaocheng Hu <xiaochengh@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690896}

third_party/blink/renderer/core/css/resolver/style_cascade_test.cc

@@ -36,6 +36,7 @@
 #include "third_party/blink/renderer/core/style/computed_style.h"
 #include "third_party/blink/renderer/core/style_property_shorthand.h"
 #include "third_party/blink/renderer/core/testing/page_test_base.h"
+#include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
 #include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
 
 namespace blink {
@@ -268,17 +269,9 @@ class TestCascadeAutoLock {
   StyleCascade::AutoLock lock_;
 };
 
-class StyleCascadeTest : public PageTestBase {
+class StyleCascadeTest : public PageTestBase, private ScopedCSSCascadeForTest {
  public:
-  void SetUp() override {
-    RuntimeEnabledFeatures::SetCSSCascadeEnabled(true);
-    PageTestBase::SetUp();
-  }
-
-  void TearDown() override {
-    PageTestBase::TearDown();
-    RuntimeEnabledFeatures::SetCSSCascadeEnabled(false);
-  }
+  StyleCascadeTest() : ScopedCSSCascadeForTest(true) {}
 
   CSSStyleSheet* CreateSheet(const String& css_text) {
     auto* init = MakeGarbageCollected<CSSStyleSheetInit>();

third_party/blink/renderer/core/exported/web_user_gesture_token_test.cc

@@ -35,12 +35,13 @@
 #include "third_party/blink/public/web/web_user_gesture_indicator.h"
 #include "third_party/blink/renderer/core/dom/user_gesture_indicator.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
+#include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
 
 namespace blink {
 
 TEST(WebUserGestureTokenTest, Basic) {
   // UserGestureTokens are meaningless with UAv2.
-  RuntimeEnabledFeatures::SetUserActivationV2Enabled(false);
+  ScopedUserActivationV2ForTest scoped_feature(false);
 
   WebUserGestureToken token;
 

third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc

@@ -34,6 +34,7 @@
 #include "third_party/blink/renderer/platform/loader/testing/mock_fetch_context.h"
 #include "third_party/blink/renderer/platform/loader/testing/test_loader_factory.h"
 #include "third_party/blink/renderer/platform/loader/testing/test_resource_fetcher_properties.h"
+#include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
 #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h"
 #include "third_party/blink/renderer/platform/testing/url_test_helpers.h"
 
@@ -120,7 +121,8 @@ void ModuleScriptLoaderTestModulator::Trace(blink::Visitor* visitor) {
 
 }  // namespace
 
-class ModuleScriptLoaderTest : public PageTestBase {
+class ModuleScriptLoaderTest : public PageTestBase,
+                               private ScopedJSONModulesForTest {
   DISALLOW_COPY_AND_ASSIGN(ModuleScriptLoaderTest);
 
  public:
@@ -168,12 +170,12 @@ class ModuleScriptLoaderTest : public PageTestBase {
 };
 
 void ModuleScriptLoaderTest::SetUp() {
-  RuntimeEnabledFeatures::SetJSONModulesEnabled(true);
   PageTestBase::SetUp(IntSize(500, 500));
 }
 
 ModuleScriptLoaderTest::ModuleScriptLoaderTest()
-    : url_("https://example.test"),
+    : ScopedJSONModulesForTest(true),
+      url_("https://example.test"),
       security_origin_(SecurityOrigin::Create(url_)) {
   platform_->AdvanceClockSeconds(1.);  // For non-zero DocumentParserTimings
 }