WeakPtr destruction order cleanup: media edition.

media/base/android/media_player_bridge.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_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 87 matching lines @@
   virtual void Prepare();
   void OnMediaPrepared();
 
   // Create the corresponding Java class instance.
   virtual void CreateJavaMediaPlayerBridge();
 
   // Get allowed operations from the player.
   virtual base::android::ScopedJavaLocalRef<jobject> GetAllowedOperations();
 
  private:
+  friend class MediaPlayerListener;
+
   // Set the data source for the media player.
   void SetDataSource(const std::string& url);
 
   // Functions that implements media player control.
   void StartInternal();
   void PauseInternal();
   void SeekInternal(base::TimeDelta time);
 
   // Called when |time_update_timer_| fires.
   void OnTimeUpdateTimerFired();
@@ skipping 43 matching lines @@
   bool can_seek_backward_;
 
   // Cookies for |url_|.
   std::string cookies_;
 
   // Java MediaPlayerBridge instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_player_bridge_;
 
   base::RepeatingTimer<MediaPlayerBridge> time_update_timer_;
 
-  // Weak pointer passed to |listener_| for callbacks.
-  base::WeakPtrFactory<MediaPlayerBridge> weak_this_;
-
   // Listener object that listens to all the media player events.
-  MediaPlayerListener listener_;
+  scoped_ptr<MediaPlayerListener> listener_;
 
   // Whether player is currently using a surface.
   bool is_surface_in_use_;
 
-  friend class MediaPlayerListener;
+  // Weak pointer passed to |listener_| for callbacks.
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<MediaPlayerBridge> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_