media/filters/pipeline_integration_test.cc - Issue 10907271: Remove HMAC from encrypted WebM test file.

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: media/filters/pipeline_integration_test.cc

Issue 10907271: Remove HMAC from encrypted WebM test file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update key of encrypted file. Created 8 years, 3 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: media/filters/pipeline_integration_test.cc

diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc

index 80acb6d810c4f3f4fe3ce9f62506466edeba2251..08bec43b28c856db998dc86bc8ebb171354b1018 100644

--- a/media/filters/pipeline_integration_test.cc

+++ b/media/filters/pipeline_integration_test.cc

@@ -362,8 +362,9 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {

ASSERT_TRUE(WaitUntilOnEnded());

}

-TEST_F(PipelineIntegrationTest, EncryptedPlayback) {

- MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 220788);

+// TODO(fgalligan): Enable after HMAC has been removed. http://crbug.com/150014

+TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) {

+ MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816);

FakeDecryptorClient encrypted_media;

StartPipelineWithEncryptedMedia(&source, &encrypted_media);

« no previous file with comments | « no previous file | media/test/data/bear-320x240-encrypted.webm » ('j') | no next file with comments »