| 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)
|
|
|