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

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

Issue 2582463003: media: Verify CDM Host files (Closed)
Patch Set: comments addressed Created 3 years, 11 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/common/BUILD.gn » ('j') | no next file with comments »
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 e61ef839ce447a79dcd04e5c71f376cc657f6794..77455ba38d133d012c4740e944ff7cdbf1b7b520 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -59,6 +59,8 @@ const char kExternalClearKeyPlatformVerificationTestKeySystem[] =
"org.chromium.externalclearkey.platformverificationtest";
const char kExternalClearKeyCrashKeySystem[] =
"org.chromium.externalclearkey.crash";
+const char kExternalClearKeyVerifyCdmHostTestKeySystem[] =
+ "org.chromium.externalclearkey.verifycdmhosttest";
// Supported media types.
const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
@@ -273,6 +275,8 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
kClearKeyCdmPepperMimeType);
+ // Need to tell CdmHostFile(s) to ignore missing CDM host files in tests.
+ command_line->AppendSwitch(switches::kIgnoreMissingCdmHostFile);
command_line->AppendSwitchASCII(switches::kEnableFeatures,
media::kExternalClearKeyForTesting.name);
}
@@ -672,4 +676,9 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
kEmeSessionNotFound);
}
+IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) {
+ TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem,
+ kUnitTestSuccess);
+}
+
#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
« no previous file with comments | « no previous file | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698