Update MediaStreamTrack::Stop to latest draft.

content/renderer/media/media_stream_video_track.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 "content/renderer/media/media_stream_video_track.h"
 
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/webrtc/webrtc_video_sink_adapter.h"
 
 namespace content {
@@ skipping 39 matching lines @@
       source_(source),
       factory_(factory) {
   // TODO(perkj): source can be NULL if this is actually a remote video track.
   // Remove as soon as we only have one implementation of video tracks.
   if (source)
     source->AddTrack(this, constraints, callback);
 }
 
 MediaStreamVideoTrack::~MediaStreamVideoTrack() {
   DCHECK(sinks_.empty());
-  // TODO(perkj): source can be NULL if this is actually a remote video track.
-  // Remove as soon as we only have one implementation of video tracks.
-  if (source_)
-    source_->RemoveTrack(this);
+  StopTrack();
 }
 
 void MediaStreamVideoTrack::AddSink(MediaStreamVideoSink* sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(std::find(sinks_.begin(), sinks_.end(), sink) == sinks_.end());
   sinks_.push_back(sink);
 }
 
 void MediaStreamVideoTrack::RemoveSink(MediaStreamVideoSink* sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 21 matching lines @@
 void MediaStreamVideoTrack::SetEnabled(bool enabled) {
   DCHECK(thread_checker_.CalledOnValidThread());
   enabled_ = enabled;
   MediaStreamTrack::SetEnabled(enabled);
   for (std::vector<MediaStreamVideoSink*>::iterator it = sinks_.begin();
        it != sinks_.end(); ++it) {
     (*it)->OnEnabledChanged(enabled);
   }
 }
 
+void MediaStreamVideoTrack::StopTrack() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (source_) {
+    source_->RemoveTrack(this);
+    source_ = NULL;
+  }
+}
+
 void MediaStreamVideoTrack::OnVideoFrame(
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!enabled_)
     return;
 
   scoped_refptr<media::VideoFrame> video_frame = frame;
   if (frame->format() == media::VideoFrame::I420) {
     // Rendering do not support I420 but video capture use I420.
     // The only difference between YV12 and I420 is the order of U and V plane.
@@ skipping 62 matching lines @@
 
 void WebRtcMediaStreamVideoTrack::RemoveSink(MediaStreamVideoSink* sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
   ScopedVector<WebRtcVideoSinkAdapter>::iterator it =
       std::find_if(sinks_.begin(), sinks_.end(), SinkWrapper(sink));
   DCHECK(it != sinks_.end());
   sinks_.erase(it);
 }
 
 }  // namespace content