Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3340)

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 2341883002: media: Add Feature to control External Clear Key key system support (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/renderer/media/chrome_key_systems.cc » ('j') | media/base/media_switches.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4b197757f7165c0702fbe1fbb525186dd3f2fc67..96283b61266f0001eadc10a6b74539992ec7e6d3 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -27,6 +27,7 @@
#if defined(ENABLE_PEPPER_CDMS)
#include "chrome/browser/media/pepper_cdm_test_constants.h"
#include "chrome/browser/media/pepper_cdm_test_helper.h"
+#include "media/base/media_switches.h"
#endif
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
@@ -271,6 +272,8 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
kClearKeyCdmPepperMimeType);
+ command_line->AppendSwitchASCII(switches::kEnableFeatures,
+ media::kExternalClearKeyForTesting.name);
}
#endif // defined(ENABLE_PEPPER_CDMS)
}
« no previous file with comments | « no previous file | chrome/renderer/media/chrome_key_systems.cc » ('j') | media/base/media_switches.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698