[Cleanup] Move all browsertests to use ScopedFeatureList to modify features

content/browser/service_worker/service_worker_browsertest.cc

Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 04443acb25ddaa521dc812e5ee7e9b011a4209f0..e30b23dbe9b2db8cd5e6f5c0e53502d81ff39503 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -1337,11 +1337,13 @@ class MockContentBrowserClient : public TestContentBrowserClient {
 class ServiceWorkerVersionOffMainThreadFetchTest
     : public ServiceWorkerVersionBrowserTest {
  public:
-  ~ServiceWorkerVersionOffMainThreadFetchTest() override {}
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    features::kOffMainThreadFetch.name);
+  ServiceWorkerVersionOffMainThreadFetchTest() {
+    scoped_feature_list_.InitAndEnableFeature(features::kOffMainThreadFetch);
   }
+  ~ServiceWorkerVersionOffMainThreadFetchTest() override {}
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchWithSaveData) {
@@ -1545,6 +1547,11 @@ class ServiceWorkerNavigationPreloadTest : public ServiceWorkerBrowserTest {
  public:
   using self = ServiceWorkerNavigationPreloadTest;
 
+  ServiceWorkerNavigationPreloadTest() {
+    scoped_feature_list_.InitAndEnableFeature(
+        features::kServiceWorkerNavigationPreload);
+  }
+
   ~ServiceWorkerNavigationPreloadTest() override {}
 
   void SetUpOnMainThread() override {
@@ -1552,12 +1559,6 @@ class ServiceWorkerNavigationPreloadTest : public ServiceWorkerBrowserTest {
     ServiceWorkerBrowserTest::SetUpOnMainThread();
   }
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitchASCII(
-        switches::kEnableFeatures,
-        features::kServiceWorkerNavigationPreload.name);
-  }
-
  protected:
   static const std::string kNavigationPreloadHeaderName;
   static const std::string kEnableNavigationPreloadScript;
@@ -1663,6 +1664,7 @@ class ServiceWorkerNavigationPreloadTest : public ServiceWorkerBrowserTest {
       request_log_;
 
  private:
+  base::test::ScopedFeatureList scoped_feature_list_;
   class CustomResponse : public net::test_server::HttpResponse {
    public:
     CustomResponse(const std::string& response) : response_(response) {}