Commit 011ceb2e authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

Reland "media: Reenable TestPolicyCheck() on Windows for Widevine"

This reverts commit 030c9cd1.

We have fixed the issue in the latest Widevine CDM and this test
should pass now.

Original change's description:
> Revert "media: Reenable TestPolicyCheck() on Windows for Widevine"
> 
> This reverts commit 3a127077.
> 
> Reason for revert: The test is still failing on Win64 trunk and Win trunk on official continuous desktop builder.
> 
> Original change's description:
> > media: Reenable TestPolicyCheck() on Windows for Widevine
> > 
> > The original problem has been fixed in the latest Widevine CDM.
> > 
> > Bug: 851027
> > Change-Id: I9aced3ea2152e33fcc8a5bcddc8a587c45dee6cc
> > Reviewed-on: https://chromium-review.googlesource.com/1154087
> > Reviewed-by: Frank Liberato <liberato@chromium.org>
> > Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#579615}
> 
> TBR=xhwang@chromium.org,liberato@chromium.org
> 
> Change-Id: I1446eb5919ac014420fe7095d7916ee92cbb3d57
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 851027
> Reviewed-on: https://chromium-review.googlesource.com/1158767
> Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
> Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#579823}

TBR=xhwang@chromium.org,liberato@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 851027
Change-Id: I3ad5c9f79aeab0ed7bfa68ded3a49664c0c295d2
Reviewed-on: https://chromium-review.googlesource.com/1162213
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580958}
parent 8ec016ed
......@@ -453,8 +453,7 @@ class EncryptedMediaTest
void TestPolicyCheck() {
// TODO(crbug.com/847591): ChromeOS Widevine CDM does not support policy check
// API yet. Remove this condition when the CDM is updated.
// TODO(crbug.com/851027): Reenable this test on Windows after bug is fixed.
#if defined(WIDEVINE_CDM_AVAILABLE) && (defined(OS_CHROMEOS) || defined(OS_WIN))
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_CHROMEOS)
if (IsWidevine(CurrentKeySystem())) {
DVLOG(0) << "Skipping test due to HDCP policy check related bugs.";
return;
......
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