Move Pipeline permanent callbacks into Pipeline::Client interface.

media/base/mock_filters.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_BASE_MOCK_FILTERS_H_
 #define MEDIA_BASE_MOCK_FILTERS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/cdm_context.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor.h"
 #include "media/base/demuxer.h"
 #include "media/base/pipeline.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer.h"
 #include "media/base/text_track.h"
+#include "media/base/text_track_config.h"
 #include "media/base/time_source.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_renderer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 
+class MockPipelineClient : public Pipeline::Client {
+ public:
+  MockPipelineClient();
+  ~MockPipelineClient();
+
+  MOCK_METHOD1(OnError, void(PipelineStatus));
+  MOCK_METHOD0(OnEnded, void());
+  MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
+  MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
+  MOCK_METHOD0(OnDurationChange, void());
+  MOCK_METHOD2(OnAddTextTrack,
+               void(const TextTrackConfig&, const AddTextTrackDoneCB&));
+  MOCK_METHOD0(OnWaitingForDecryptionKey, void());
+};
+
 class MockPipeline : public Pipeline {
  public:
   MockPipeline();
   virtual ~MockPipeline();
 
   // Note: Start() and Resume() declarations are not actually overrides; they
   // take scoped_ptr* instead of scoped_ptr so that they can be mock methods.

[xhwang, 2016/05/04 06:32:22]

nit: s/scoped_ptr/unique_ptr

[alokp, 2016/05/04 17:40:01]

Done.

   // Private stubs for Start() and Resume() implement the actual Pipeline
   // interface by forwarding to these mock methods.
-  MOCK_METHOD10(Start,
-                void(Demuxer*,
-                     std::unique_ptr<Renderer>*,
-                     const base::Closure&,
-                     const PipelineStatusCB&,
-                     const PipelineStatusCB&,
-                     const PipelineMetadataCB&,
-                     const BufferingStateCB&,
-                     const base::Closure&,
-                     const AddTextTrackCB&,
-                     const base::Closure&));
-  MOCK_METHOD1(Stop, void(const base::Closure&));
+  MOCK_METHOD4(Start,
+               void(Demuxer*,
+                    std::unique_ptr<Renderer>*,
+                    Client*,
+                    const PipelineStatusCB&));
+  MOCK_METHOD0(Stop, void());
   MOCK_METHOD2(Seek, void(base::TimeDelta, const PipelineStatusCB&));
   MOCK_METHOD1(Suspend, void(const PipelineStatusCB&));
   MOCK_METHOD3(Resume,
                void(std::unique_ptr<Renderer>*,
                     base::TimeDelta,
                     const PipelineStatusCB&));
 
   // TODO(sandersd): This should automatically return true between Start() and
   // Stop(). (Or better, remove it from the interface entirely.)
   MOCK_CONST_METHOD0(IsRunning, bool());
@@ skipping 10 matching lines @@
   MOCK_CONST_METHOD0(GetMediaDuration, base::TimeDelta());
   MOCK_METHOD0(DidLoadingProgress, bool());
   MOCK_CONST_METHOD0(GetStatistics, PipelineStatistics());
 
   MOCK_METHOD2(SetCdm, void(CdmContext*, const CdmAttachedCB&));
 
  private:
   // Forwarding stubs (see comment above).
   void Start(Demuxer* demuxer,
              std::unique_ptr<Renderer> renderer,
-             const base::Closure& ended_cb,
-             const PipelineStatusCB& error_cb,
-             const PipelineStatusCB& seek_cb,
-             const PipelineMetadataCB& metadata_cb,
-             const BufferingStateCB& buffering_state_cb,
-             const base::Closure& duration_change_cb,
-             const AddTextTrackCB& add_text_track_cb,
-             const base::Closure& waiting_for_decryption_key_cb) override;
+             Client* client,
+             const PipelineStatusCB& seek_cb) override;
   void Resume(std::unique_ptr<Renderer> renderer,
               base::TimeDelta timestamp,
               const PipelineStatusCB& seek_cb) override;
 
   DISALLOW_COPY_AND_ASSIGN(MockPipeline);
 };
 
 class MockDemuxer : public Demuxer {
  public:
   MockDemuxer();
@@ skipping 238 matching lines @@
   MOCK_METHOD0(GetDecryptor, Decryptor*());
   int GetCdmId() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockCdmContext);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_