WeakPtr destruction order cleanup: media edition.

media/filters/opus_audio_decoder.h

Index: media/filters/opus_audio_decoder.h
diff --git a/media/filters/opus_audio_decoder.h b/media/filters/opus_audio_decoder.h
index 2faacedd83b34856a815b3525e94d319e12d0319..98dba4395afc622650d8edb0e602b6a4aca08ae5 100644
--- a/media/filters/opus_audio_decoder.h
+++ b/media/filters/opus_audio_decoder.h
@@ -58,8 +58,6 @@ class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder {
               scoped_refptr<AudioBuffer>* output_buffer);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<OpusAudioDecoder> weak_factory_;
-  base::WeakPtr<OpusAudioDecoder> weak_this_;
 
   DemuxerStream* demuxer_stream_;
   StatisticsCB statistics_cb_;
@@ -96,6 +94,11 @@ class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder {
   // from the CodecDelay value in the container.
   base::TimeDelta timestamp_offset_;
 
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<OpusAudioDecoder> weak_this_;

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

ditto

+  base::WeakPtrFactory<OpusAudioDecoder> weak_factory_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder);
 };