content/browser/media/encrypted_media_browsertest.cc - Issue 2701203003: media: Prefer decrypting pipeline when CDM is attached

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2701203003: media: Prefer decrypting pipeline when CDM is attached (Closed)

Patch Set: comments addressed Created 3 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:

Index: content/browser/media/encrypted_media_browsertest.cc

diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc

index 1503a169c483e445a1de1ac232b4c139ddd01f7b..decc3cb13d5b851b8378a86f6598409730c4bcc4 100644

--- a/content/browser/media/encrypted_media_browsertest.cc

+++ b/content/browser/media/encrypted_media_browsertest.cc

@@ -244,10 +244,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_ClearToClear) {

TestConfigChange(ConfigChangeType::CLEAR_TO_CLEAR);

}

-// TODO(xhwang): Support switching from clear to encrypted and enable this test.

-// See http://crbug.com/597443

-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,

- DISABLED_ConfigChangeVideo_ClearToEncrypted) {

+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_ClearToEncrypted) {

TestConfigChange(ConfigChangeType::CLEAR_TO_ENCRYPTED);

}