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

Unified Diff: media/filters/chunk_demuxer_unittest.cc

Issue 10451049: Track buffered byte ranges correctly in media::Pipeline. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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_demuxer.cc » ('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 61ee9c2bd8f1820378f52d8f57113fc7b29c1793..0595bdc7c082d36dbce175a0a3495fc9644ba2ac 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -183,9 +183,8 @@ class ChunkDemuxerTest : public testing::Test {
bool AppendData(const uint8* data, size_t length) {
CHECK(length);
- EXPECT_CALL(host_, SetBufferedBytes(_))
- .Times(AnyNumber())
- .WillRepeatedly(SaveArg<0>(&buffered_bytes_));
+ EXPECT_CALL(host_, AddBufferedByteRange(_, _)).Times(AnyNumber())
+ .WillRepeatedly(SaveArg<1>(&buffered_bytes_));
EXPECT_CALL(host_, SetNetworkActivity(true))
.Times(AnyNumber());
return demuxer_->AppendData(kSourceId, data, length);
@@ -227,10 +226,8 @@ class ChunkDemuxerTest : public testing::Test {
PipelineStatusCB CreateInitDoneCB(const base::TimeDelta& expected_duration,
PipelineStatus expected_status) {
- if (expected_status == PIPELINE_OK) {
+ if (expected_status == PIPELINE_OK)
EXPECT_CALL(host_, SetDuration(expected_duration));
- EXPECT_CALL(host_, SetCurrentReadPosition(_));
- }
return base::Bind(&ChunkDemuxerTest::InitDoneCalled,
base::Unretained(this),
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698