WeakPtr destruction order cleanup: media edition.

media/filters/decrypting_demuxer_stream.h

Index: media/filters/decrypting_demuxer_stream.h
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h
index aa9e897f226b0194492b3583cee03a5b333a1a21..0c8dd8e0b45401f7a952d98b790471ca24e286a6 100644
--- a/media/filters/decrypting_demuxer_stream.h
+++ b/media/filters/decrypting_demuxer_stream.h
@@ -99,8 +99,6 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   void InitializeDecoderConfig();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_;
-  base::WeakPtr<DecryptingDemuxerStream> weak_this_;
 
   State state_;
 
@@ -128,6 +126,11 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   // decrypting again in case the newly added key is the correct decryption key.
   bool key_added_while_decrypt_pending_;
 
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<DecryptingDemuxerStream> weak_this_;

[Ami GONE FROM CHROMIUM, 2014/03/10 22:02:08]

ditto

+  base::WeakPtrFactory<DecryptingDemuxerStream> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream);
 };