Replace StreamParserHost interface with callbacks.

media/filters/chunk_demuxer.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_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <list>
 #include <string>
 
 #include "base/synchronization/lock.h"
 #include "media/base/byte_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/stream_parser.h"
 
 namespace media {
 
 class ChunkDemuxerClient;
 class ChunkDemuxerStream;
 class FFmpegURLProtocol;
 
 // Demuxer implementation that allows chunks of media data to be passed
 // from JavaScript to the media stack.
-class MEDIA_EXPORT ChunkDemuxer : public Demuxer, public StreamParserHost {
+class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
  public:
   enum Status {
     kOk,              // ID added w/o error.
     kNotSupported,    // Type specified is not supported.
     kReachedIdLimit,  // Reached ID limit. We can't handle any more IDs.
   };
 
   explicit ChunkDemuxer(ChunkDemuxerClient* client);
   virtual ~ChunkDemuxer();
 
@@ skipping 44 matching lines @@
   };
 
   void ChangeState_Locked(State new_state);
 
   // Reports an error and puts the demuxer in a state where it won't accept more
   // data.
   void ReportError_Locked(PipelineStatus error);
 
   void OnStreamParserInitDone(bool success, base::TimeDelta duration);
 
-  // StreamParserHost implementation.
-  virtual bool OnNewConfigs(const AudioDecoderConfig& audio_config,
-                            const VideoDecoderConfig& video_config) OVERRIDE;
-  virtual bool OnAudioBuffers(const BufferQueue& buffer) OVERRIDE;
-  virtual bool OnVideoBuffers(const BufferQueue& buffer) OVERRIDE;
+  // StreamParser callbacks.
+  bool OnNewConfigs(const AudioDecoderConfig& audio_config,
+                    const VideoDecoderConfig& video_config);
+  bool OnAudioBuffers(const StreamParser::BufferQueue& buffer);
+  bool OnVideoBuffers(const StreamParser::BufferQueue& buffer);
 
   base::Lock lock_;
   State state_;
 
   DemuxerHost* host_;
   ChunkDemuxerClient* client_;
   PipelineStatusCB init_cb_;
   PipelineStatusCB seek_cb_;
 
   scoped_refptr<ChunkDemuxerStream> audio_;
@@ skipping 11 matching lines @@
 
   // TODO(acolwell): Remove this when fixing http://crbug.com/122909
   std::string source_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_