Make sure that a MediaStreamVideoSource can be deleted in the context of a failure callback.

TEST= content_unittests MediaStreamVideoSourceTest.ReleaseTrackAndSourceOnFailureCallBack
BUG= 364207

Review URL: https://codereview.chromium.org/238443015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264489 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 1 deletions

diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index 7a0ec71..73ee6ec 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -437,8 +437,10 @@ void MediaStreamVideoSource::OnSupportedFormats(
                                      &current_format_,
                                      &max_frame_output_size_,
                                      &current_constraints_)) {
-    FinalizeAddTrack();
     SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded);
+    // This object can be deleted after calling FinalizeAddTrack. See comment
+    // in the header file.
+    FinalizeAddTrack();
     return;
   }
 
@@ -493,6 +495,8 @@ void MediaStreamVideoSource::OnStartDone(bool success) {
     StopSourceImpl();
   }
 
+  // This object can be deleted after calling FinalizeAddTrack. See comment in
+  // the header file.
   FinalizeAddTrack();
 }