Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: media/filters/chunk_demuxer_unittest.cc

Issue 10669022: Add status parameter to DemuxerStream::ReadCB (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 2e074acca1b2e648b56dcf7cdd72557814519a6b..a05d2342e6945d832f9f3c29d8823571c92ae1ac 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -72,13 +72,17 @@ MATCHER_P(HasTimestamp, timestamp_in_ms, "") {
static void OnReadDone(const base::TimeDelta& expected_time,
bool* called,
+ DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer) {
+ EXPECT_EQ(status, DemuxerStream::kOk);
EXPECT_EQ(expected_time, buffer->GetTimestamp());
*called = true;
}
static void OnReadDone_EOSExpected(bool* called,
+ DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer) {
+ EXPECT_EQ(status, DemuxerStream::kOk);
EXPECT_TRUE(buffer->IsEndOfStream());
*called = true;
}
@@ -517,10 +521,12 @@ class ChunkDemuxerTest : public testing::Test {
EXPECT_EQ(ss.str(), expected);
}
- MOCK_METHOD1(ReadDone, void(const scoped_refptr<DecoderBuffer>&));
+ MOCK_METHOD2(ReadDone, void(DemuxerStream::Status status,
+ const scoped_refptr<DecoderBuffer>&));
void ExpectRead(DemuxerStream* stream, int64 timestamp_in_ms) {
- EXPECT_CALL(*this, ReadDone(HasTimestamp(timestamp_in_ms)));
+ EXPECT_CALL(*this, ReadDone(DemuxerStream::kOk,
+ HasTimestamp(timestamp_in_ms)));
stream->Read(base::Bind(&ChunkDemuxerTest::ReadDone,
base::Unretained(this)));
}
@@ -965,7 +971,10 @@ class EndOfStreamHelper {
private:
static void OnEndOfStreamReadDone(
- bool* called, const scoped_refptr<DecoderBuffer>& buffer) {
+ bool* called,
+ DemuxerStream::Status status,
+ const scoped_refptr<DecoderBuffer>& buffer) {
+ EXPECT_EQ(status, DemuxerStream::kOk);
EXPECT_TRUE(buffer->IsEndOfStream());
*called = true;
}
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698