1 files changed, 3 insertions, 2 deletions
diff --git a/media/base/text_renderer.h b/media/base/text_renderer.h
index dab18e6671..ce10912556 100644
--- a/media/base/text_renderer.h
+++ b/media/base/text_renderer.h
@@ -105,8 +105,6 @@ class MEDIA_EXPORT TextRenderer {
   void Read(TextTrackState* state, DemuxerStream* text_stream);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<TextRenderer> weak_factory_;
-  base::WeakPtr<TextRenderer> weak_this_;
   const AddTextTrackCB add_text_track_cb_;
 
   // Callbacks provided during Initialize().
@@ -140,6 +138,9 @@ class MEDIA_EXPORT TextRenderer {
   typedef std::set<DemuxerStream*> PendingEosSet;
   PendingEosSet pending_eos_set_;
 
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<TextRenderer> weak_factory_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(TextRenderer);
 };