WeakPtr destruction order cleanup: media edition.

media/filters/ffmpeg_demuxer.h

Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 32cba81bd7888cc7294d53e1ad936f7d606faf5b..88c0b09ebc991718bd8671261bbe9698a4eed4df 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -205,8 +205,6 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
   DemuxerHost* host_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
-  base::WeakPtr<FFmpegDemuxer> weak_this_;
 
   // Thread on which all blocking FFmpeg operations are executed.
   base::Thread blocking_thread_;
@@ -264,6 +262,11 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
 
   const NeedKeyCB need_key_cb_;
 
+  // NOTE: These must always be last so they're invalidated before other member
+  // variables might be accessed.
+  base::WeakPtr<FFmpegDemuxer> weak_this_;

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

ditto

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