WeakPtr destruction order cleanup: media edition.

content/renderer/media/android/media_source_delegate.cc

Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 1654e1314e0c3e7eb87d9bdd43f53bd79e1b3277..8c92dda5401f6f5cbb2cd65e50d3840a100025ea 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -50,12 +50,7 @@ MediaSourceDelegate::MediaSourceDelegate(
     int demuxer_client_id,
     const scoped_refptr<base::MessageLoopProxy>& media_loop,
     media::MediaLog* media_log)
-    : main_loop_(base::MessageLoopProxy::current()),
-      main_weak_factory_(this),
-      main_weak_this_(main_weak_factory_.GetWeakPtr()),
-      media_loop_(media_loop),
-      media_weak_factory_(this),
-      demuxer_client_(demuxer_client),
+    : demuxer_client_(demuxer_client),
       demuxer_client_id_(demuxer_client_id),
       media_log_(media_log),
       is_demuxer_ready_(false),
@@ -66,8 +61,13 @@ MediaSourceDelegate::MediaSourceDelegate(
       doing_browser_seek_(false),
       browser_seek_time_(media::kNoTimestamp()),
       expecting_regular_seek_(false),
-      access_unit_size_(0) {
+      access_unit_size_(0),
+      main_loop_(base::MessageLoopProxy::current()),
+      media_loop_(media_loop),
+      main_weak_factory_(this),
+      media_weak_factory_(this) {
   DCHECK(main_loop_->BelongsToCurrentThread());
+  main_weak_this_ = main_weak_factory_.GetWeakPtr();

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

(if you take my suggestion in the .h then you can move this back to an
initializer)

[DaleCurtis, 2014/03/10 23:47:46]

Done.

 }
 
 MediaSourceDelegate::~MediaSourceDelegate() {