Index: media/filters/chunk_demuxer_unittest.cc |
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc |
index cd1d96fb7841eb712e483619c579cb8a7a9d9467..d6407856a624c1533162c35673f3dd347eee7a8d 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; |
} |
@@ -484,10 +488,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))); |
} |
@@ -939,7 +945,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; |
} |