Fold DecryptingDemuxerStream::Stop() into the dtor.

media/filters/decoder_stream.cc

 // Copyright 2014 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.
 
 #include "media/filters/decoder_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/location.h"
@@ skipping 56 matching lines @@
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(base::ResetAndReturn(&init_cb_), false));
   }
   if (!read_cb_.is_null()) {
     task_runner_->PostTask(FROM_HERE, base::Bind(
         base::ResetAndReturn(&read_cb_), ABORTED, scoped_refptr<Output>()));
   }
   if (!reset_cb_.is_null())
     task_runner_->PostTask(FROM_HERE, base::ResetAndReturn(&reset_cb_));
 
-  if (decrypting_demuxer_stream_)
-    decrypting_demuxer_stream_->Stop();
-
   stream_ = NULL;
   decoder_.reset();
   decrypting_demuxer_stream_.reset();
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderStream<StreamType>::Initialize(DemuxerStream* stream,
                                            bool low_delay,
                                            const StatisticsCB& statistics_cb,
                                            const InitCB& init_cb) {
@@ skipping 445 matching lines @@
   }
 
   // The resetting process will be continued in OnDecoderReinitialized().
   ReinitializeDecoder();
 }
 
 template class DecoderStream<DemuxerStream::VIDEO>;
 template class DecoderStream<DemuxerStream::AUDIO>;
 
 }  // namespace media