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

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

Issue 1989893004: media: Use platform specific folders for CDMs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix create_installer_archive.py Created 4 years, 7 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
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 78cd3c866cabbdfa689bcceb20b0ff9ade5e0c9d..c04916fbc4042036872b219847f435b5f8494c56 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -251,13 +251,15 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
#if defined(ENABLE_PEPPER_CDMS)
if (IsExternalClearKey(key_system)) {
- RegisterPepperCdm(command_line, kClearKeyCdmAdapterFileName,
- kClearKeyCdmDisplayName, kClearKeyCdmPepperMimeType);
+ RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
+ kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
+ kClearKeyCdmPepperMimeType);
}
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
else if (IsWidevine(key_system)) { // NOLINT
- RegisterPepperCdm(command_line, kWidevineCdmAdapterFileName,
- kWidevineCdmDisplayName, kWidevineCdmPluginMimeType);
+ RegisterPepperCdm(command_line, kWidevineCdmBaseDirectory,
+ kWidevineCdmAdapterFileName, kWidevineCdmDisplayName,
+ kWidevineCdmPluginMimeType);
}
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
#endif // defined(ENABLE_PEPPER_CDMS)

Powered by Google App Engine
This is Rietveld 408576698