WeakPtr destruction order cleanup: media edition.

media/filters/fake_video_decoder.h

 // Copyright 2013 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_FAKE_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_
 
 #include <list>
 
 #include "base/bind.h"
@@ skipping 56 matching lines @@
   // Callback for updating |total_bytes_decoded_|.
   void OnFrameDecoded(int buffer_size,
                       const DecodeCB& read_cb,
                       Status status,
                       const scoped_refptr<VideoFrame>& video_frame);
 
   void DoReset();
   void DoStop();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<FakeVideoDecoder> weak_factory_;
-  base::WeakPtr<FakeVideoDecoder> weak_this_;
 
   const int decoding_delay_;
 
   bool supports_get_decode_output_;
 
   State state_;
 
   CallbackHolder<PipelineStatusCB> init_cb_;
   CallbackHolder<DecodeCB> decode_cb_;
   CallbackHolder<base::Closure> reset_cb_;
   CallbackHolder<base::Closure> stop_cb_;
 
   VideoDecoderConfig current_config_;
 
   std::list<scoped_refptr<VideoFrame> > decoded_frames_;
 
   int total_bytes_decoded_;
 
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<FakeVideoDecoder> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(FakeVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_