WeakPtr destruction order cleanup: media edition.

media/filters/decoder_stream.h

Index: media/filters/decoder_stream.h
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index 8f4658b34ddbe0e3ab1da13d0483e4e166108047..601c1a0a078fd757a9f6e379434ccf4ae1fbbbb8 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -138,7 +138,6 @@ class MEDIA_EXPORT DecoderStream {
   void OnDecoderStopped();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<DecoderStream<StreamType> > weak_factory_;
 
   State state_;
 
@@ -157,6 +156,10 @@ class MEDIA_EXPORT DecoderStream {
   scoped_ptr<Decoder> decoder_;
   scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
 
+  // NOTE: This must always be last so it's invalidated before other member
+  // variables might be accessed.
+  base::WeakPtrFactory<DecoderStream<StreamType> > weak_factory_;
+
   // This is required so the VideoFrameStream can access private members in
   // FinishInitialization() and ReportStatistics().
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderStream);