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 c2915258e475c48a496cd93434b7bbe2593a8f8b..128a5c6386d8d47de71050dfbf1d7c48b3133360 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" |
@@ -290,6 +291,12 @@ class EncryptedMediaSupportedTypesClearKeyTest |
class EncryptedMediaSupportedTypesExternalClearKeyTest |
: public EncryptedMediaSupportedTypesTest { |
#if BUILDFLAG(ENABLE_PEPPER_CDMS) |
+ public: |
+ EncryptedMediaSupportedTypesExternalClearKeyTest() { |
+ scoped_feature_list_.InitAndEnableFeature( |
+ media::kExternalClearKeyForTesting); |
+ } |
+ |
protected: |
void SetUpCommandLine(base::CommandLine* command_line) override { |
EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line); |
@@ -297,9 +304,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) |
}; |
@@ -329,6 +337,12 @@ class EncryptedMediaSupportedTypesWidevineTest |
// Registers ClearKey CDM with the wrong path (filename). |
class EncryptedMediaSupportedTypesClearKeyCDMRegisteredWithWrongPathTest |
: public EncryptedMediaSupportedTypesTest { |
+ public: |
+ EncryptedMediaSupportedTypesClearKeyCDMRegisteredWithWrongPathTest() { |
+ scoped_feature_list_.InitAndEnableFeature( |
+ media::kExternalClearKeyForTesting); |
+ } |
+ |
protected: |
void SetUpCommandLine(base::CommandLine* command_line) override { |
EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line); |
@@ -336,9 +350,10 @@ class EncryptedMediaSupportedTypesClearKeyCDMRegisteredWithWrongPathTest |
"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). |