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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/key_systems.cc

Issue 2268283003: media: Add External Clear Key content browser test on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« content/browser/media/encrypted_media_browsertest.cc ('K') | « media/base/android/android_cdm_factory.cc ('k') | media/mojo/clients/mojo_cdm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 4567bf4c614a12bb8d46c1f758f44e302c5434ca..02d4b698701c00a8f79fece072e4332a0036f164 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -418,6 +418,9 @@ void KeySystemsImpl::AddSupportedKeySystems(
properties->GetPepperType().empty());
if (!properties->GetPepperType().empty())
can_block = true;
+#elif defined(OS_ANDROID)
+ if (IsExternalClearKey(properties->GetKeySystemName()))
+ can_block = true;
#endif
if (!can_block) {
DCHECK(properties->GetDistinctiveIdentifierSupport() ==
« content/browser/media/encrypted_media_browsertest.cc ('K') | « media/base/android/android_cdm_factory.cc ('k') | media/mojo/clients/mojo_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698