Fold DecryptingDemuxerStream::Stop() into the dtor.

media/filters/audio_decoder_selector_unittest.cc

Index: media/filters/audio_decoder_selector_unittest.cc
diff --git a/media/filters/audio_decoder_selector_unittest.cc b/media/filters/audio_decoder_selector_unittest.cc
index 2b4cce54675ca0d54662dfb969c567291be33e85..0e2ccfe7e050efcd9c99aebc8245b11146cc6f0f 100644
--- a/media/filters/audio_decoder_selector_unittest.cc
+++ b/media/filters/audio_decoder_selector_unittest.cc
@@ -132,16 +132,21 @@ class AudioDecoderSelectorTest : public ::testing::Test {
     NOTREACHED();
   }
 
-  // Fixture members.
-  scoped_ptr<AudioDecoderSelector> decoder_selector_;
+  // Declare |decoder_selector_| after |demuxer_stream_| and |decryptor_| since
+  // |demuxer_stream_| and |decryptor_| should outlive |decoder_selector_|.
   scoped_ptr<StrictMock<MockDemuxerStream> > demuxer_stream_;
+
   // Use NiceMock since we don't care about most of calls on the decryptor, e.g.
   // RegisterNewKeyCB().
   scoped_ptr<NiceMock<MockDecryptor> > decryptor_;
+
+  scoped_ptr<AudioDecoderSelector> decoder_selector_;
+
   StrictMock<MockAudioDecoder>* decoder_1_;
   StrictMock<MockAudioDecoder>* decoder_2_;
   ScopedVector<AudioDecoder> all_decoders_;
   scoped_ptr<AudioDecoder> selected_decoder_;
+
   base::MessageLoop message_loop_;
 
  private: