Commit 470f4cba authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Fix EncryptedMediaTest.PolicyCheck

This is a temparory fix so that EncryptedMediaTest.PolicyCheck
doesn't fail on Google Chrome build when using Widevine CDM. A
more proper fix will be landed later.

Bug: 849846
Change-Id: Iaa92f1b547489c825cf5fc095f9a0fc37ac660d2
Reviewed-on: https://chromium-review.googlesource.com/1087819
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: default avatarJohn Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564771}
parent bf5d61ae
...@@ -64,6 +64,11 @@ PlayerUtils.registerEMEEventListeners = function(player) { ...@@ -64,6 +64,11 @@ PlayerUtils.registerEMEEventListeners = function(player) {
}); });
} }
// Call getStatusForPolicy() and compare the result with |expectedResult|.
// |expectedResult| can be a valid key status, e.g. "usable", in which case
// getStatusForPolicy() should return a resolved promise. It can also be
// "rejected", in which getStatusForPolicy() should return a rejected
// promise.
function getStatusForHdcpPolicy(mediaKeys, hdcpVersion, expectedResult) { function getStatusForHdcpPolicy(mediaKeys, hdcpVersion, expectedResult) {
return mediaKeys.getStatusForPolicy({minHdcpVersion: hdcpVersion}) return mediaKeys.getStatusForPolicy({minHdcpVersion: hdcpVersion})
.then( .then(
...@@ -97,12 +102,19 @@ PlayerUtils.registerEMEEventListeners = function(player) { ...@@ -97,12 +102,19 @@ PlayerUtils.registerEMEEventListeners = function(player) {
return getStatusForHdcpPolicy( return getStatusForHdcpPolicy(
mediaKeys, "hdcp-2.2", "output-restricted"); mediaKeys, "hdcp-2.2", "output-restricted");
}); });
} else { } else if (keySystem == CLEARKEY) {
return Promise.resolve().then(function() { return Promise.resolve().then(function () {
return getStatusForHdcpPolicy(mediaKeys, "", "rejected"); return getStatusForHdcpPolicy(mediaKeys, "", "rejected");
}).then(function() { }).then(function () {
return getStatusForHdcpPolicy(mediaKeys, "hdcp-1.0", "rejected"); return getStatusForHdcpPolicy(mediaKeys, "hdcp-1.0", "rejected");
}); });
} else if (keySystem == WIDEVINE_KEYSYSTEM) {
// TODO(crbug.com/849846): Currently support on HDCP policy check by
// Widevine CDM varies on different platforms. Update this to test more
// specific behaviors.
return Promise.resolve();
} else {
return Promise.reject("Unsupported key system");
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment