media/filters/ffmpeg_video_decoder_unittest.cc - Issue 10543146: Use NSS for symmetric key crypto operations on Windows and Mac.

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/ffmpeg_video_decoder_unittest.cc

Issue 10543146: Use NSS for symmetric key crypto operations on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed DEPS; rebased Created 8 years, 6 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/ffmpeg_video_decoder_unittest.cc

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

index 6367ab248b73b4ac3aec8dd2750809f2a2c806b3..2b4fc94b408ab7a9cd81264cda3551fd2e762009 100644

--- a/media/filters/ffmpeg_video_decoder_unittest.cc

+++ b/media/filters/ffmpeg_video_decoder_unittest.cc

@@ -435,7 +435,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_WrongKey) {

VideoDecoder::DecoderStatus status;

scoped_refptr<VideoFrame> video_frame;

Read(&status, &video_frame);

-#if defined(OS_LINUX)

+#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)

EXPECT_EQ(VideoDecoder::kDecodeError, status);

#else

EXPECT_EQ(VideoDecoder::kDecryptError, status);

« no previous file with comments | « crypto/symmetric_key_mac.cc ('k') | no next file » | no next file with comments »