Move Pipeline permanent callbacks into Pipeline::Client interface.

media/test/pipeline_integration_test_base.h

Index: media/test/pipeline_integration_test_base.h
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
index 82304897309b18d6eb7a710357793f0e3cefdebb..2e5b79fefcb83ba20231be0f7d69280cb5c44df3 100644
--- a/media/test/pipeline_integration_test_base.h
+++ b/media/test/pipeline_integration_test_base.h
@@ -58,7 +58,7 @@ class DummyTickClock : public base::TickClock {
 // 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();
@@ -150,8 +150,6 @@ class PipelineIntegrationTestBase {
 
   void DemuxerMediaTracksUpdatedCB(scoped_ptr<MediaTracks> tracks);
 
-  void OnEnded();
-  void OnError(PipelineStatus status);
   void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
 
   // Creates Demuxer and sets |demuxer_|.
@@ -162,9 +160,12 @@ class PipelineIntegrationTestBase {
 
   void OnVideoFramePaint(const scoped_refptr<VideoFrame>& frame);
 
-  MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
-  MOCK_METHOD1(OnBufferingStateChanged, void(BufferingState));
   MOCK_METHOD1(DecryptorAttached, void(bool));
+  // Pipeline::Client overrides.
+  void OnError(PipelineStatus status) override;
+  void OnEnded() override;
+  MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
+  MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
   MOCK_METHOD2(OnAddTextTrack,
                void(const TextTrackConfig& config,
                     const AddTextTrackDoneCB& done_cb));