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

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: . 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:
View side-by-side diff with in-line comments
Download patch
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;
}

Powered by Google App Engine
This is Rietveld 408576698