Index: chrome/browser/media/encrypted_media_browsertest.cc |
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc |
index 3938185059a13c54ec7b2d9b9e54fbce8c7ad28e..30485e65f22679833b5814dc51128bd9034aa676 100644 |
--- a/chrome/browser/media/encrypted_media_browsertest.cc |
+++ b/chrome/browser/media/encrypted_media_browsertest.cc |
@@ -9,6 +9,7 @@ |
#include "base/path_service.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "base/test/scoped_feature_list.h" |
#include "base/threading/thread_restrictions.h" |
#include "build/build_config.h" |
#include "chrome/browser/media/media_browsertest.h" |
@@ -291,11 +292,15 @@ class EncryptedMediaTestBase : public MediaBrowserTest { |
media::kClearKeyCdmAdapterFileName, |
media::kClearKeyCdmDisplayName, |
media::kClearKeyCdmPepperMimeType); |
- command_line->AppendSwitchASCII(switches::kEnableFeatures, |
- media::kExternalClearKeyForTesting.name); |
+ scoped_feature_list_.InitAndEnableFeature( |
+ media::kExternalClearKeyForTesting); |
Ilya Sherman
2017/06/12 21:50:29
As in the other file, could this be done outside o
chaopeng
2017/06/28 19:21:22
Done.
|
} |
#endif // BUILDFLAG(ENABLE_PEPPER_CDMS) |
} |
+#if BUILDFLAG(ENABLE_PEPPER_CDMS) |
+ private: |
+ base::test::ScopedFeatureList scoped_feature_list_; |
+#endif // BUILDFLAG(ENABLE_PEPPER_CDMS) |
Ilya Sherman
2017/06/12 21:50:29
Does anything go wrong if you omit this #if, and j
chaopeng
2017/06/28 19:21:22
Done.
|
}; |
#if BUILDFLAG(ENABLE_PEPPER_CDMS) |