Move Pipeline permanent callbacks into Pipeline::Client interface.

media/filters/pipeline_controller_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/pipeline_controller.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 10 matching lines @@
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::Mock;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 namespace media {
 
-class PipelineControllerTest : public ::testing::Test {
+class PipelineControllerTest : public ::testing::Test, public Pipeline::Client {
  public:
   PipelineControllerTest()
       : pipeline_controller_(&pipeline_,
                              base::Bind(&PipelineControllerTest::CreateRenderer,
                                         base::Unretained(this)),
                              base::Bind(&PipelineControllerTest::OnSeeked,
                                         base::Unretained(this)),
                              base::Bind(&PipelineControllerTest::OnSuspended,
                                         base::Unretained(this)),
                              base::Bind(&PipelineControllerTest::OnError,
                                         base::Unretained(this))) {}
 
   ~PipelineControllerTest() override {}
 
   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;
   }
 
   PipelineStatusCB StartPipeline() { return StartPipeline(false, true); }
 
   PipelineStatusCB StartPipeline_WithDynamicData() {
     return StartPipeline(false, false);
   }
@@ skipping 48 matching lines @@
     return std::unique_ptr<Renderer>();
   }
 
   void OnSeeked(bool time_updated) {
     was_seeked_ = true;
     last_seeked_time_updated_ = time_updated;
   }
 
   void OnSuspended() { was_suspended_ = true; }
 
-  void OnError(PipelineStatus status) { NOTREACHED(); }
+  // Pipeline::Client overrides
+  void OnError(PipelineStatus status) override { NOTREACHED(); }
+  void OnEnded() override{};
+  void OnMetadata(PipelineMetadata metadata) override{};
+  void OnBufferingStateChange(BufferingState state) override{};
+  void OnDurationChange() override{};
+  void OnAddTextTrack(const TextTrackConfig& config,
+                      const AddTextTrackDoneCB& done_cb) override{};
+  void OnWaitingForDecryptionKey() override{};
 
   base::MessageLoop message_loop_;
 
   NiceMock<MockDemuxer> demuxer_;
   StrictMock<MockPipeline> pipeline_;
   PipelineController pipeline_controller_;
 
   bool was_seeked_ = false;
   bool last_seeked_time_updated_ = false;
   bool was_suspended_ = false;
@@ skipping 176 matching lines @@
   // Request a seek to the same time again.
   pipeline_controller_.Seek(seek_time, true);
   message_loop_.RunUntilIdle();
 
   // Expect the second seek to trigger when the first seek completes.
   EXPECT_CALL(pipeline_, Seek(seek_time, _));
   Complete(seek_cb_1);
 }
 
 }  // namespace media