WeakPtr destruction order cleanup: media edition.

media/base/text_renderer.cc

 // 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.
 
 #include "media/base/text_renderer.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/demuxer.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/text_cue.h"
 
 namespace media {
 
 TextRenderer::TextRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     const AddTextTrackCB& add_text_track_cb)
     : task_runner_(task_runner),
-      weak_factory_(this),
       add_text_track_cb_(add_text_track_cb),
       state_(kUninitialized),
-      pending_read_count_(0) {
-}
+      pending_read_count_(0),
+      weak_factory_(this) {}
 
 TextRenderer::~TextRenderer() {
   DCHECK(state_ == kUninitialized ||
          state_ == kStopped) << "state_ " << state_;
   DCHECK_EQ(pending_read_count_, 0);
   STLDeleteValues(&text_track_state_map_);
 }
 
 void TextRenderer::Initialize(const base::Closure& ended_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
@@ skipping 322 matching lines @@
 
 TextRenderer::TextTrackState::TextTrackState(scoped_ptr<TextTrack> tt)
     : read_state(kReadIdle),
       text_track(tt.Pass()) {
 }
 
 TextRenderer::TextTrackState::~TextTrackState() {
 }
 
 }  // namespace media