Index: media/filters/chunk_demuxer_unittest.cc |
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc |
index d242aae8c61b83cfd1c6bb8b7f89ac002b538b29..7d8c2aaa26bfa1714a0cbf9b59555ea36a14bea9 100644 |
--- a/media/filters/chunk_demuxer_unittest.cc |
+++ b/media/filters/chunk_demuxer_unittest.cc |
@@ -255,7 +255,7 @@ class ChunkDemuxerTest : public testing::Test { |
return false; |
start += append_size; |
- EXPECT_GT(buffered_bytes_, old_buffered_bytes); |
+ EXPECT_GE(buffered_bytes_, old_buffered_bytes); |
Ami GONE FROM CHROMIUM
2012/06/18 16:18:31
Why the change? Rounding?
acolwell GONE FROM CHROMIUM
2012/06/19 06:12:34
Some of the appends are smaller than an actual fra
|
} |
return true; |
} |
@@ -283,8 +283,11 @@ 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) { |
+ if (expected_duration != kInfiniteDuration()) |
+ EXPECT_CALL(host_, SetTotalBytes(_)); |
EXPECT_CALL(host_, SetDuration(expected_duration)); |
+ } |
return base::Bind(&ChunkDemuxerTest::InitDoneCalled, |
base::Unretained(this), |