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

Unified Diff: media/filters/pipeline_controller_unittest.cc

Issue 1830913005: Convert WMPI state management to level-triggered. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix grammar. Created 4 years, 9 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
« media/blink/webmediaplayer_impl.h ('K') | « media/filters/pipeline_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_controller_unittest.cc
diff --git a/media/filters/pipeline_controller_unittest.cc b/media/filters/pipeline_controller_unittest.cc
index bd9fad13957dc16e021d3b207746b94dbf436a76..547cd96638abc986a39a643b27bf558ec2d05d9c 100644
--- a/media/filters/pipeline_controller_unittest.cc
+++ b/media/filters/pipeline_controller_unittest.cc
@@ -36,8 +36,6 @@ class PipelineControllerTest : public ::testing::Test {
base::Unretained(this)),
base::Bind(&PipelineControllerTest::OnSuspended,
base::Unretained(this)),
- base::Bind(&PipelineControllerTest::OnResumed,
- base::Unretained(this)),
base::Bind(&PipelineControllerTest::OnError,
base::Unretained(this))) {}
@@ -118,8 +116,6 @@ class PipelineControllerTest : public ::testing::Test {
void OnSuspended() { was_suspended_ = true; }
- void OnResumed() { was_resumed_ = true; }
-
void OnError(PipelineStatus status) { NOTREACHED(); }
base::MessageLoop message_loop_;
@@ -131,7 +127,6 @@ class PipelineControllerTest : public ::testing::Test {
bool was_seeked_ = false;
bool last_seeked_time_updated_ = false;
bool was_suspended_ = false;
- bool was_resumed_ = false;
base::TimeDelta last_resume_time_;
DISALLOW_COPY_AND_ASSIGN(PipelineControllerTest);
@@ -145,7 +140,6 @@ TEST_F(PipelineControllerTest, Startup) {
EXPECT_TRUE(was_seeked_);
EXPECT_FALSE(last_seeked_time_updated_);
EXPECT_FALSE(was_suspended_);
- EXPECT_FALSE(was_resumed_);
EXPECT_TRUE(pipeline_controller_.IsStable());
}
@@ -156,11 +150,9 @@ TEST_F(PipelineControllerTest, SuspendResume) {
Complete(SuspendPipeline());
EXPECT_TRUE(was_suspended_);
- EXPECT_FALSE(was_resumed_);
EXPECT_FALSE(pipeline_controller_.IsStable());
Complete(ResumePipeline());
- EXPECT_TRUE(was_resumed_);
EXPECT_TRUE(pipeline_controller_.IsStable());
// |was_seeked_| should not be affected by Suspend()/Resume() at all.
@@ -194,7 +186,6 @@ TEST_F(PipelineControllerTest, SuspendResumeTime) {
message_loop_.RunUntilIdle();
Complete(ResumePipeline());
- EXPECT_TRUE(was_resumed_);
EXPECT_EQ(seek_time, last_resume_time_);
}
@@ -207,7 +198,6 @@ TEST_F(PipelineControllerTest, SuspendResumeTime_WithStreamingData) {
message_loop_.RunUntilIdle();
Complete(ResumePipeline());
- EXPECT_TRUE(was_resumed_);
EXPECT_EQ(base::TimeDelta(), last_resume_time_);
}
« media/blink/webmediaplayer_impl.h ('K') | « media/filters/pipeline_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698