WeakPtr destruction order cleanup: media edition.

media/filters/decoder_stream.h

 // 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.
 
 #ifndef MEDIA_FILTERS_DECODER_STREAM_H_
 #define MEDIA_FILTERS_DECODER_STREAM_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 129 matching lines @@
   // Callback for Decoder reinitialization.
   void OnDecoderReinitialized(PipelineStatus status);
 
   void ResetDecoder();
   void OnDecoderReset();
 
   void StopDecoder();
   void OnDecoderStopped();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<DecoderStream<StreamType> > weak_factory_;
 
   State state_;
 
   StatisticsCB statistics_cb_;
   InitCB init_cb_;
 
   ReadCB read_cb_;
   base::Closure reset_cb_;
   base::Closure stop_cb_;
 
   DemuxerStream* stream_;
 
   scoped_ptr<DecoderSelector<StreamType> > decoder_selector_;
 
   // These two will be set by DecoderSelector::SelectDecoder().
   scoped_ptr<Decoder> decoder_;
   scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
 
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<DecoderStream<StreamType> > weak_factory_;
+
   // This is required so the VideoFrameStream can access private members in
   // FinishInitialization() and ReportStatistics().
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderStream);
 };
 
 template <>
 bool DecoderStream<DemuxerStream::AUDIO>::CanReadWithoutStalling() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_H_