WeakPtr destruction order cleanup: media edition.

media/base/android/media_source_player.h

 // Copyright (c) 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_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 61 matching lines @@
   virtual bool IsSurfaceInUse() const OVERRIDE;
 
   // DemuxerAndroidClient implementation.
   virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) OVERRIDE;
   virtual void OnDemuxerDataAvailable(const DemuxerData& params) OVERRIDE;
   virtual void OnDemuxerSeekDone(
       const base::TimeDelta& actual_browser_seek_time) OVERRIDE;
   virtual void OnDemuxerDurationChanged(base::TimeDelta duration) OVERRIDE;
 
  private:
+  friend class MediaSourcePlayerTest;
+
   // Update the current timestamp.
   void UpdateTimestamps(const base::TimeDelta& presentation_timestamp,
                         size_t audio_output_bytes);
 
   // Helper function for starting media playback.
   void StartInternal();
 
   // Playback is completed for one channel.
   void PlaybackCompleted(bool is_audio);
 
@@ skipping 172 matching lines @@
   base::TimeDelta preroll_timestamp_;
 
   // A cancelable task that is posted when the audio decoder starts requesting
   // new data. This callback runs if no data arrives before the timeout period
   // elapses.
   base::CancelableClosure decoder_starvation_callback_;
 
   // Object to calculate the current audio timestamp for A/V sync.
   scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_;
 
-  // Weak pointer passed to media decoder jobs for callbacks.
-  base::WeakPtrFactory<MediaSourcePlayer> weak_this_;
-
   MediaDrmBridge* drm_bridge_;
 
   // No decryption key available to decrypt the encrypted buffer. In this case,
   // the player should pause. When a new key is added (OnKeyAdded()), we should
   // try to start playback again.
   bool is_waiting_for_key_;
 
   // Test-only callback for hooking the completion of the next decode cycle.
   base::Closure decode_callback_for_testing_;
 
   // Whether |surface_| is currently used by the player.
   bool is_surface_in_use_;
 
-  friend class MediaSourcePlayerTest;
+  // Weak pointer passed to media decoder jobs for callbacks.  NOTE: This must
+  // always be last so it's invalidated before other member variables might be
+  // accessed.
+  base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_