Update MediaStreamTrack::Stop to latest draft.

content/renderer/media/media_stream_center.cc

 // Copyright (c) 2012 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_center.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 108 matching lines @@
     const blink::WebMediaStreamTrack& track) {
   MediaStreamTrack* native_track =
       MediaStreamTrack::GetTrack(track);
   if (native_track)
     native_track->SetEnabled(false);
 }
 
 bool MediaStreamCenter::didStopMediaStreamTrack(
     const blink::WebMediaStreamTrack& track) {
   DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack";
-  blink::WebMediaStreamSource source = track.source();
-  MediaStreamSource* extra_data =
-      static_cast<MediaStreamSource*>(source.extraData());
-  if (!extra_data) {
-    DVLOG(1) << "didStopMediaStreamTrack called on a remote track.";
+  MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track);
+  if (!native_track)
     return false;

[no longer working on chromium, 2014/04/01 18:29:58]

Can this happen? Add an error log if it can. otherwise add a DCHECK.

BTW, if the users call Stop on the track multiple times, we always return a
true, right?

[perkj_chrome, 2014/04/02 13:35:49]

Done.

Yes. In the latest spec Stop is a void method so blink can clean this up if
wanted.

-  }
 
-  extra_data->StopSource();
+  native_track->StopTrack();
   return true;
 }
 
 blink::WebAudioSourceProvider*
 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack(
     const blink::WebMediaStreamTrack& track) {
   DVLOG(1) << "MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack";
   MediaStreamTrack* media_stream_track =
       static_cast<MediaStreamTrack*>(track.extraData());
   // Only local audio track is supported now.
@@ skipping 14 matching lines @@
 void MediaStreamCenter::didStopLocalMediaStream(
     const blink::WebMediaStream& stream) {
   DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream";
   MediaStream* native_stream = MediaStream::GetMediaStream(stream);
   if (!native_stream) {
     NOTREACHED();
     return;
   }
 
   // TODO(perkj): MediaStream::Stop is being deprecated. But for the moment we
-  // need to support the old behavior and the new. Since we only create one
-  // source object per actual device- we need to fake stopping a
-  // MediaStreamTrack by disabling it if the same device is used as source by
-  // multiple tracks. Note that disabling a track here, don't affect the
-  // enabled property in JS.
+  // need to support both MediaStream::Stop and  MediaStreamTrack::Stop.

[no longer working on chromium, 2014/04/01 18:29:58]

nit, remove the extra space

[perkj_chrome, 2014/04/02 13:35:49]

Done.

   blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
   stream.audioTracks(audio_tracks);
   for (size_t i = 0; i < audio_tracks.size(); ++i)
-    didDisableMediaStreamTrack(audio_tracks[i]);
+    didStopMediaStreamTrack(audio_tracks[i]);
 
   blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
   stream.videoTracks(video_tracks);
   for (size_t i = 0; i < video_tracks.size(); ++i)
-    didDisableMediaStreamTrack(video_tracks[i]);
-
-  native_stream->OnStreamStopped();
+    didStopMediaStreamTrack(video_tracks[i]);
 }
 
 void MediaStreamCenter::didCreateMediaStream(blink::WebMediaStream& stream) {
   DVLOG(1) << "MediaStreamCenter::didCreateMediaStream";
   blink::WebMediaStream writable_stream(stream);
   MediaStream* native_stream(
       new MediaStream(rtc_factory_,
-                      MediaStream::StreamStopCallback(),
                       stream));
   writable_stream.setExtraData(native_stream);
 
   // TODO(perkj): Remove track creation once crbug/294145 is fixed. A track
   // should already have been created before reaching here.
   blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
   stream.audioTracks(audio_tracks);
   for (size_t i = 0; i < audio_tracks.size(); ++i) {
     if (!MediaStreamTrack::GetTrack(audio_tracks[i]))
       CreateNativeMediaStreamTrack(audio_tracks[i], rtc_factory_);
@@ skipping 66 matching lines @@
                     device.type == MEDIA_DEVICE_AUDIO_CAPTURE
                         ? blink::WebSourceInfo::SourceKindAudio
                         : blink::WebSourceInfo::SourceKindVideo,
                     blink::WebString::fromUTF8(device.name),
                     video_facing);
   }
   request_it->second.requestSucceeded(sourceInfos);
 }
 
 }  // namespace content