WeakPtr destruction order cleanup: media edition.

media/filters/decrypting_audio_decoder.h

 // Copyright (c) 2012 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_DECRYPTING_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 81 matching lines @@
 
   // Updates audio configs from |demuxer_stream_| and resets
   // |output_timestamp_base_| and |total_samples_decoded_|.
   void UpdateDecoderConfig();
 
   // Sets timestamp and duration for |queued_audio_frames_| to make sure the
   // renderer always receives continuous frames without gaps and overlaps.
   void EnqueueFrames(const Decryptor::AudioBuffers& frames);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<DecryptingAudioDecoder> weak_factory_;
-  base::WeakPtr<DecryptingAudioDecoder> weak_this_;
 
   State state_;
 
   PipelineStatusCB init_cb_;
   DecodeCB decode_cb_;
   base::Closure reset_cb_;
   base::Closure stop_cb_;
 
   // The current decoder configuration.
   AudioDecoderConfig config_;
@@ skipping 15 matching lines @@
 
   Decryptor::AudioBuffers queued_audio_frames_;
 
   // Decoded audio format.
   int bits_per_channel_;
   ChannelLayout channel_layout_;
   int samples_per_second_;
 
   scoped_ptr<AudioTimestampHelper> timestamp_helper_;
 
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<DecryptingAudioDecoder> weak_factory_;
+  base::WeakPtr<DecryptingAudioDecoder> weak_this_;
+
   DISALLOW_COPY_AND_ASSIGN(DecryptingAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_