Move Pipeline permanent callbacks into Pipeline::Client interface.

media/test/pipeline_integration_test_base.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_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include "base/md5.h"
@@ skipping 40 matching lines @@
 
 // Integration tests for Pipeline. Real demuxers, real decoders, and
 // base renderer implementations are used to verify pipeline functionality. The
 // renderers used in these tests rely heavily on the AudioRendererBase &
 // VideoRendererImpl implementations which contain a majority of the code used
 // in the real AudioRendererImpl & SkCanvasVideoRenderer implementations used in
 // the browser. The renderers in this test don't actually write data to a
 // display or audio device. Both of these devices are simulated since they have
 // little effect on verifying pipeline behavior and allow tests to run faster
 // than real-time.
-class PipelineIntegrationTestBase {
+class PipelineIntegrationTestBase : public Pipeline::Client {
  public:
   PipelineIntegrationTestBase();
   virtual ~PipelineIntegrationTestBase();
 
   // Test types for advanced testing and benchmarking (e.g., underflow is
   // disabled to ensure consistent hashes). May be combined using the bitwise
   // or operator (and as such must have values that are powers of two).
   enum TestTypeFlags { kNormal = 0, kHashed = 1, kClockless = 2 };
 
   // Starts the pipeline with a file specified by |filename|, optionally with a
@@ skipping 71 matching lines @@
                                CdmContext* cdm_context,
                                uint8_t test_type);
 
   void OnSeeked(base::TimeDelta seek_time, PipelineStatus status);
   void OnStatusCallback(PipelineStatus status);
   void DemuxerEncryptedMediaInitDataCB(EmeInitDataType type,
                                        const std::vector<uint8_t>& init_data);
 
   void DemuxerMediaTracksUpdatedCB(scoped_ptr<MediaTracks> tracks);
 
-  void OnEnded();
-  void OnError(PipelineStatus status);
   void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
 
   // Creates Demuxer and sets |demuxer_|.
   void CreateDemuxer(scoped_ptr<DataSource> data_source);
 
   // Creates and returns a Renderer.
   virtual scoped_ptr<Renderer> CreateRenderer();
 
   void OnVideoFramePaint(const scoped_refptr<VideoFrame>& frame);
 
+  MOCK_METHOD1(DecryptorAttached, void(bool));
+  // Pipeline::Client overrides.
+  void OnError(PipelineStatus status) override;
+  void OnEnded() override;
   MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
-  MOCK_METHOD1(OnBufferingStateChanged, void(BufferingState));
-  MOCK_METHOD1(DecryptorAttached, void(bool));
+  MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
   MOCK_METHOD2(OnAddTextTrack,
                void(const TextTrackConfig& config,
                     const AddTextTrackDoneCB& done_cb));
   MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_