media/filters/decrypting_video_decoder_unittest.cc - Issue 123213006: Make VideoDecoder use (kAborted, NULL) to signify an aborted decode, instead of (kOk, NULL).

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

Issue 123213006: Make VideoDecoder use (kAborted, NULL) to signify an aborted decode, instead of (kOk, NULL). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit tests Created 6 years, 12 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:

View side-by-side diff with in-line comments

Download patch

Index: media/filters/decrypting_video_decoder_unittest.cc

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

index 1e8bee9feceacb780a6aed80ef6709981917922a..1d6296b816697debc37f8379c446492cc6fa2c97 100644

--- a/media/filters/decrypting_video_decoder_unittest.cc

+++ b/media/filters/decrypting_video_decoder_unittest.cc

@@ -363,7 +363,7 @@ TEST_F(DecryptingVideoDecoderTest, Reset_DuringPendingDecode) {

Initialize();

EnterPendingDecodeState();

- EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));

+ EXPECT_CALL(*this, FrameReady(VideoDecoder::kAborted, IsNull()));

Reset();

}

@@ -373,7 +373,7 @@ TEST_F(DecryptingVideoDecoderTest, Reset_DuringWaitingForKey) {

Initialize();

EnterWaitingForKeyState();

- EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));

+ EXPECT_CALL(*this, FrameReady(VideoDecoder::kAborted, IsNull()));

Reset();

}

@@ -446,7 +446,7 @@ TEST_F(DecryptingVideoDecoderTest, Stop_DuringPendingDecode) {

Initialize();

EnterPendingDecodeState();

- EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));

+ EXPECT_CALL(*this, FrameReady(VideoDecoder::kAborted, IsNull()));

Stop();

}

@@ -456,7 +456,7 @@ TEST_F(DecryptingVideoDecoderTest, Stop_DuringWaitingForKey) {

Initialize();

EnterWaitingForKeyState();

- EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));

+ EXPECT_CALL(*this, FrameReady(VideoDecoder::kAborted, IsNull()));

Stop();

}

@@ -478,7 +478,7 @@ TEST_F(DecryptingVideoDecoderTest, Stop_DuringPendingReset) {

EnterPendingDecodeState();

EXPECT_CALL(*decryptor_, ResetDecoder(Decryptor::kVideo));

- EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));

+ EXPECT_CALL(*this, FrameReady(VideoDecoder::kAborted, IsNull()));

decoder_->Reset(NewExpectedClosure());

Stop();

« no previous file with comments | « media/filters/decrypting_video_decoder.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »