media/filters/audio_decoder_selector_unittest.cc - Issue 331863004: Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..."

Unified Diff: media/filters/audio_decoder_selector_unittest.cc

Issue 331863004: Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2049/src/

Patch Set: Created 6 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:

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

Download patch

Index: media/filters/audio_decoder_selector_unittest.cc

===================================================================

--- media/filters/audio_decoder_selector_unittest.cc (revision 277175)

+++ media/filters/audio_decoder_selector_unittest.cc (working copy)

@@ -118,8 +118,7 @@

demuxer_stream_.get(),

false,

base::Bind(&AudioDecoderSelectorTest::MockOnDecoderSelected,

- base::Unretained(this)),

- base::Bind(&AudioDecoderSelectorTest::OnDecoderOutput));

+ base::Unretained(this)));

message_loop_.RunUntilIdle();

}

@@ -131,10 +130,6 @@

message_loop_.RunUntilIdle();

}

- static void OnDecoderOutput(const scoped_refptr<AudioBuffer>& output) {

- NOTREACHED();

- }

// Fixture members.

scoped_ptr<AudioDecoderSelector> decoder_selector_;

scoped_ptr<StrictMock<MockDemuxerStream> > demuxer_stream_;

@@ -173,7 +168,7 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _))

.WillOnce(RunCallback<1>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));

EXPECT_CALL(*decoder_1_, Stop());

@@ -186,7 +181,7 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _));

+ EXPECT_CALL(*decoder_1_, Initialize(_, _));

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -198,9 +193,9 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _))

.WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_2_, Initialize(_, _))

.WillOnce(RunCallback<1>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));

EXPECT_CALL(*decoder_2_, Stop());

@@ -213,9 +208,9 @@

UseClearStream();

InitializeDecoderSelector(kNoDecryptor, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _))

.WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _));

+ EXPECT_CALL(*decoder_2_, Initialize(_, _));

EXPECT_CALL(*decoder_2_, Stop());

SelectDecoderAndAbort();

@@ -227,7 +222,7 @@

UseClearStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _))

.WillOnce(RunCallback<1>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));

EXPECT_CALL(*decoder_1_, Stop());

@@ -239,7 +234,7 @@

UseClearStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _));

+ EXPECT_CALL(*decoder_1_, Initialize(_, _));

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -280,7 +275,7 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _))

.WillOnce(RunCallback<1>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));

EXPECT_CALL(*decoder_1_, Stop());

@@ -293,7 +288,7 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 1);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _));

+ EXPECT_CALL(*decoder_1_, Initialize(_, _));

EXPECT_CALL(*decoder_1_, Stop());

SelectDecoderAndAbort();

@@ -307,9 +302,9 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _))

.WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_2_, Initialize(_, _))

.WillOnce(RunCallback<1>(PIPELINE_OK));

EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, NotNull()));

EXPECT_CALL(*decoder_2_, Stop());

@@ -322,9 +317,9 @@

UseEncryptedStream();

InitializeDecoderSelector(kDecryptOnly, 2);

- EXPECT_CALL(*decoder_1_, Initialize(_, _, _))

+ EXPECT_CALL(*decoder_1_, Initialize(_, _))

.WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));

- EXPECT_CALL(*decoder_2_, Initialize(_, _, _));

+ EXPECT_CALL(*decoder_2_, Initialize(_, _));

EXPECT_CALL(*decoder_2_, Stop());

SelectDecoderAndAbort();

« no previous file with comments | « media/base/video_decoder.cc ('k') | media/filters/audio_renderer_impl_unittest.cc » ('j') | no next file with comments »