Fold {Audio|Video}Decoder::Stop() into the dtor.

media/filters/decoder_selector.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 "decoder_selector.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 112 matching lines @@
     return;
 
   // We must be trying to initialize the |decoder_| or the
   // |decrypted_stream_|. Invalid all weak pointers so that all initialization
   // callbacks won't fire.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   if (decoder_) {
     // |decrypted_stream_| is either NULL or already initialized. We don't
     // need to Stop() |decrypted_stream_| in either case.
-    decoder_->Stop();
+    decoder_.reset();
     ReturnNullDecoder();
     return;
   }
 
   if (decrypted_stream_) {
     decrypted_stream_->Stop();
     ReturnNullDecoder();
     return;
   }
 
@@ skipping 88 matching lines @@
 
 // These forward declarations tell the compiler that we will use
 // DecoderSelector with these arguments, allowing us to keep these definitions
 // in our .cc without causing linker errors. This also means if anyone tries to
 // instantiate a DecoderSelector with anything but these two specializations
 // they'll most likely get linker errors.
 template class DecoderSelector<DemuxerStream::AUDIO>;
 template class DecoderSelector<DemuxerStream::VIDEO>;
 
 }  // namespace media