Index: media/filters/chunk_demuxer.cc |
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc |
index 92489ce54220f121623af8a840e2e56804d13f18..ec7cdcb8a605004a0b26d91a7b20b3001bb7ffe6 100644 |
--- a/media/filters/chunk_demuxer.cc |
+++ b/media/filters/chunk_demuxer.cc |
@@ -123,7 +123,6 @@ class ChunkDemuxerStream : public DemuxerStream { |
explicit ChunkDemuxerStream(const AudioDecoderConfig& audio_config); |
explicit ChunkDemuxerStream(const VideoDecoderConfig& video_config); |
- virtual ~ChunkDemuxerStream(); |
void Flush(); |
void Seek(base::TimeDelta time); |
@@ -150,6 +149,9 @@ class ChunkDemuxerStream : public DemuxerStream { |
virtual const AudioDecoderConfig& audio_decoder_config() OVERRIDE; |
virtual const VideoDecoderConfig& video_decoder_config() OVERRIDE; |
+ protected: |
+ virtual ~ChunkDemuxerStream(); |
+ |
private: |
enum State { |
RETURNING_DATA_FOR_READS, |
@@ -203,8 +205,6 @@ ChunkDemuxerStream::ChunkDemuxerStream(const VideoDecoderConfig& video_config) |
video_config_.CopyFrom(video_config); |
} |
-ChunkDemuxerStream::~ChunkDemuxerStream() {} |
- |
void ChunkDemuxerStream::Flush() { |
DVLOG(1) << "Flush()"; |
ReadCBQueue read_cbs; |
@@ -417,6 +417,8 @@ void ChunkDemuxerStream::ChangeState_Locked(State state) { |
state_ = state; |
} |
+ChunkDemuxerStream::~ChunkDemuxerStream() {} |
+ |
void ChunkDemuxerStream::DeferRead_Locked(const ReadCB& read_cb) { |
lock_.AssertAcquired(); |
// Wrap & store |read_cb| so that it will |
@@ -460,10 +462,6 @@ ChunkDemuxer::ChunkDemuxer(ChunkDemuxerClient* client) |
DCHECK(client); |
} |
-ChunkDemuxer::~ChunkDemuxer() { |
- DCHECK_NE(state_, INITIALIZED); |
-} |
- |
void ChunkDemuxer::Initialize(DemuxerHost* host, |
const PipelineStatusCB& cb) { |
DVLOG(1) << "Init()"; |
@@ -813,6 +811,10 @@ void ChunkDemuxer::ChangeState_Locked(State new_state) { |
state_ = new_state; |
} |
+ChunkDemuxer::~ChunkDemuxer() { |
+ DCHECK_NE(state_, INITIALIZED); |
+} |
+ |
void ChunkDemuxer::ReportError_Locked(PipelineStatus error) { |
lock_.AssertAcquired(); |
DCHECK_NE(error, PIPELINE_OK); |