Index: media/base/pipeline_impl_unittest.cc |
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc |
index f0f2e8d0f1b3e94bc1756e7ff639f8201f1d12f6..942d5432990fe651525d21e341862c2e9143e1b7 100644 |
--- a/media/base/pipeline_impl_unittest.cc |
+++ b/media/base/pipeline_impl_unittest.cc |
@@ -231,6 +231,7 @@ class PipelineImplTest : public ::testing::Test { |
FakeTextTrackStream* text_stream() { return text_stream_.get(); } |
void ExpectSeek(const base::TimeDelta& seek_time, bool underflowed) { |
+ EXPECT_CALL(*demuxer_, AbortPendingReads()); |
EXPECT_CALL(*demuxer_, Seek(seek_time, _)) |
.WillOnce(RunCallback<1>(PIPELINE_OK)); |
@@ -256,12 +257,8 @@ class PipelineImplTest : public ::testing::Test { |
} |
void ExpectSuspend() { |
+ EXPECT_CALL(*demuxer_, AbortPendingReads()); |
EXPECT_CALL(*renderer_, SetPlaybackRate(0)); |
- EXPECT_CALL(*renderer_, Flush(_)) |
- .WillOnce( |
- DoAll(SetBufferingState(&renderer_client_, BUFFERING_HAVE_NOTHING), |
- RunClosure<0>())); |
- EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_NOTHING)); |
EXPECT_CALL(callbacks_, OnSuspend(PIPELINE_OK)); |
} |
@@ -695,6 +692,7 @@ TEST_F(PipelineImplTest, ErrorDuringSeek) { |
DoAll(SetBufferingState(&renderer_client_, BUFFERING_HAVE_NOTHING), |
RunClosure<0>())); |
+ EXPECT_CALL(*demuxer_, AbortPendingReads()); |
EXPECT_CALL(*demuxer_, Seek(seek_time, _)) |
.WillOnce(RunCallback<1>(PIPELINE_ERROR_READ)); |
EXPECT_CALL(*demuxer_, Stop()); |
@@ -748,6 +746,7 @@ TEST_F(PipelineImplTest, NoMessageDuringTearDownFromError) { |
RunClosure<0>())); |
EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_NOTHING)); |
+ EXPECT_CALL(*demuxer_, AbortPendingReads()); |
EXPECT_CALL(*demuxer_, Seek(seek_time, _)) |
.WillOnce(RunCallback<1>(PIPELINE_ERROR_READ)); |
EXPECT_CALL(*demuxer_, Stop()); |
@@ -929,6 +928,7 @@ class PipelineTeardownTest : public PipelineImplTest { |
void DoSeek(TeardownState state, StopOrError stop_or_error) { |
SetSeekExpectations(state, stop_or_error); |
+ EXPECT_CALL(*demuxer_, AbortPendingReads()); |
EXPECT_CALL(*demuxer_, Stop()); |
pipeline_->Seek( |
@@ -1002,12 +1002,8 @@ class PipelineTeardownTest : public PipelineImplTest { |
void SetSuspendExpectations(TeardownState state, StopOrError stop_or_error) { |
EXPECT_CALL(*renderer_, SetPlaybackRate(0)); |
- EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_NOTHING)); |
+ EXPECT_CALL(*demuxer_, AbortPendingReads()); |
EXPECT_CALL(callbacks_, OnSuspend(PIPELINE_OK)); |
- EXPECT_CALL(*renderer_, Flush(_)) |
- .WillOnce( |
- DoAll(SetBufferingState(&renderer_client_, BUFFERING_HAVE_NOTHING), |
- RunClosure<0>())); |
if (state == kResuming) { |
if (stop_or_error == kStop) { |
EXPECT_CALL(*demuxer_, Seek(_, _)) |