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

chrome/browser/media/encrypted_media_supported_types_browsertest.cc

Index: chrome/browser/media/encrypted_media_supported_types_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
index f6badf40b7aba616a6f63d8a95c707bfd17ee5a8..47f3829d17b856b225f1ce6e1e7b5ef85fba95e4 100644
--- a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
@@ -12,6 +12,7 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ -294,6 +295,12 @@ class EncryptedMediaSupportedTypesClearKeyTest
 class EncryptedMediaSupportedTypesExternalClearKeyTest
     : public EncryptedMediaSupportedTypesTest {
 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
+  void SetUp() override {
+    scoped_feature_list_.InitAndEnableFeature(
+        media::kExternalClearKeyForTesting);
+    EncryptedMediaSupportedTypesTest::SetUp();
+  }
+
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
@@ -301,9 +308,10 @@ class EncryptedMediaSupportedTypesExternalClearKeyTest
                       media::kClearKeyCdmAdapterFileName,
                       media::kClearKeyCdmDisplayName,
                       media::kClearKeyCdmPepperMimeType);
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    media::kExternalClearKeyForTesting.name);
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 };
 
@@ -334,15 +342,21 @@ class EncryptedMediaSupportedTypesWidevineTest
 class EncryptedMediaSupportedTypesClearKeyCDMRegisteredWithWrongPathTest
     : public EncryptedMediaSupportedTypesTest {
  protected:
+  void SetUp() override {
+    scoped_feature_list_.InitAndEnableFeature(
+        media::kExternalClearKeyForTesting);
+    EncryptedMediaSupportedTypesTest::SetUp();
+  }
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
     RegisterPepperCdm(command_line, media::kClearKeyCdmBaseDirectory,
                       "clearkeycdmadapterwrongname.dll",
                       media::kClearKeyCdmDisplayName,
                       media::kClearKeyCdmPepperMimeType, false);
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    media::kExternalClearKeyForTesting.name);
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 // Registers Widevine CDM with the wrong path (filename).