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

Unified Diff: media/filters/pipeline_controller_unittest.cc

Issue 1904793002: Move Pipeline permanent callbacks into Pipeline::Client interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 8 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/filters/pipeline_controller_unittest.cc
diff --git a/media/filters/pipeline_controller_unittest.cc b/media/filters/pipeline_controller_unittest.cc
index eec11d8d7d46e87c29126801b727567e4bab80bd..6d6242c98bbc1b051b9b6ac4c8c852aff21504e4 100644
--- a/media/filters/pipeline_controller_unittest.cc
+++ b/media/filters/pipeline_controller_unittest.cc
@@ -26,7 +26,7 @@ using ::testing::StrictMock;
namespace media {
-class PipelineControllerTest : public ::testing::Test {
+class PipelineControllerTest : public ::testing::Test, public Pipeline::Client {
public:
PipelineControllerTest()
: pipeline_controller_(&pipeline_,
@@ -44,12 +44,8 @@ class PipelineControllerTest : public ::testing::Test {
PipelineStatusCB StartPipeline(bool is_streaming, bool is_static) {
EXPECT_FALSE(pipeline_controller_.IsStable());
PipelineStatusCB start_cb;
- EXPECT_CALL(pipeline_, Start(_, _, _, _, _, _, _, _, _, _))
- .WillOnce(SaveArg<4>(&start_cb));
- pipeline_controller_.Start(&demuxer_, is_streaming, is_static,
- base::Closure(), PipelineMetadataCB(),
- BufferingStateCB(), base::Closure(),
- AddTextTrackCB(), base::Closure());
+ EXPECT_CALL(pipeline_, Start(_, _, _, _)).WillOnce(SaveArg<3>(&start_cb));
+ pipeline_controller_.Start(&demuxer_, this, is_streaming, is_static);
Mock::VerifyAndClear(&pipeline_);
EXPECT_FALSE(pipeline_controller_.IsStable());
return start_cb;

Powered by Google App Engine
This is Rietveld 408576698