Make sure MediaStreamSource::StopCallback is triggered if the VideoCaptureDevice is stopped.

This change make sure that the MediaStreamSource::StopCallback is triggered if a video capture device is stopped from the browser process. The MediaStreamSource::StopCallback is hooked up to MediaStreamImpl to allow it to clean up.

BUG=368030

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

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

1 files changed, 2 insertions, 4 deletions

diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index e210a83..45c6abd 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -356,7 +356,6 @@ MediaStreamVideoSource::MediaStreamVideoSource()
 }
 
 MediaStreamVideoSource::~MediaStreamVideoSource() {
-  DVLOG(3) << "~MediaStreamVideoSource()";
 }
 
 void MediaStreamVideoSource::AddTrack(
@@ -515,9 +514,7 @@ void MediaStreamVideoSource::OnStartDone(bool success) {
     state_ = STARTED;
     SetReadyState(blink::WebMediaStreamSource::ReadyStateLive);
   } else {
-    state_ = ENDED;
-    SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded);
-    StopSourceImpl();
+    StopSource();
   }
 
   // This object can be deleted after calling FinalizeAddTrack. See comment in
@@ -570,6 +567,7 @@ void MediaStreamVideoSource::FinalizeAddTrack() {
 
 void MediaStreamVideoSource::SetReadyState(
     blink::WebMediaStreamSource::ReadyState state) {
+  DVLOG(3) << "MediaStreamVideoSource::SetReadyState state " << state;
   if (!owner().isNull()) {
     owner().setReadyState(state);
   }