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

Unified Diff: media/base/pipeline_impl_unittest.cc

Issue 2267963002: Add support for cancellation of demuxer reads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actually abort the data. Created 4 years, 4 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/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index f0f2e8d0f1b3e94bc1756e7ff639f8201f1d12f6..524b3d5fceb4a31e5c0d46a22b27f53fc59a0e1a 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -257,11 +257,6 @@ class PipelineImplTest : public ::testing::Test {
void ExpectSuspend() {
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));
}
@@ -1002,12 +997,7 @@ 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(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(_, _))

Powered by Google App Engine
This is Rietveld 408576698