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

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

Issue 1732423002: EME: Remove the concept of a parent key system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ks
Patch Set: Add test per review. Created 4 years, 10 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 | components/cdm/renderer/widevine_key_systems.cc » ('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 21d2bb4fe15da4bbe316f4275e904ca34c020c65..496758fc3955fd3aadf4ce974ed814f20cf2245e 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -105,20 +105,16 @@ static bool IsMSESupported() {
return true;
}
-static bool IsParentKeySystemOf(const std::string& parent_key_system,
- const std::string& key_system) {
- std::string prefix = parent_key_system + '.';
- return key_system.substr(0, prefix.size()) == prefix;
-}
-
// Base class for encrypted media tests.
class EncryptedMediaTestBase : public MediaBrowserTest {
public:
EncryptedMediaTestBase() : is_pepper_cdm_registered_(false) {}
bool IsExternalClearKey(const std::string& key_system) {
- return key_system == kExternalClearKeyKeySystem ||
- IsParentKeySystemOf(kExternalClearKeyKeySystem, key_system);
+ if (key_system == kExternalClearKeyKeySystem)
+ return true;
+ std::string prefix = std::string(kExternalClearKeyKeySystem) + '.';
+ return key_system.substr(0, prefix.size()) == prefix;
}
#if defined(WIDEVINE_CDM_AVAILABLE)
« no previous file with comments | « no previous file | components/cdm/renderer/widevine_key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698