Update MediaStreamTrack::Stop to latest draft.

content/renderer/media/webrtc_local_audio_track.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/webrtc_local_audio_track.h"
 
 #include "content/public/renderer/media_stream_audio_sink.h"
 #include "content/renderer/media/media_stream_audio_level_calculator.h"
 #include "content/renderer/media/media_stream_audio_processor.h"
 #include "content/renderer/media/media_stream_audio_sink_owner.h"
@@ skipping 20 matching lines @@
   if (!webaudio_source_) {
     source_provider_.reset(new WebRtcLocalAudioSourceProvider());
     AddSink(source_provider_.get());
   }
   DVLOG(1) << "WebRtcLocalAudioTrack::WebRtcLocalAudioTrack()";
 }
 
 WebRtcLocalAudioTrack::~WebRtcLocalAudioTrack() {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   DVLOG(1) << "WebRtcLocalAudioTrack::~WebRtcLocalAudioTrack()";
-  // Users might not call Stop() on the track.
-  Stop();
+  // Users might not call StopTrack() on the track.

[tommi (sloooow) - chröme, 2014/04/03 08:53:16]

is this something we should rather enforce than work around?

[perkj_chrome, 2014/04/03 11:58:34]

I would rather just remove the comment...
StopTrack (or Stop) is triggered from JS so, no I think this is what we want.

+  StopTrack();
 }
 
 void WebRtcLocalAudioTrack::Capture(const int16* audio_data,
                                     base::TimeDelta delay,
                                     int volume,
                                     bool key_pressed,
                                     bool need_audio_processing) {
   DCHECK(capture_thread_checker_.CalledOnValidThread());
 
   // Calculate the signal level regardless if the track is disabled or enabled.
@@ skipping 155 matching lines @@
     base::AutoLock auto_lock(lock_);
     sinks = sinks_.Items();
   }
   for (SinkList::ItemList::const_iterator it = sinks.begin();
        it != sinks.end();
        ++it) {
     (*it)->OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateLive);
   }
 }
 
-void WebRtcLocalAudioTrack::Stop() {
+void WebRtcLocalAudioTrack::StopTrack() {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   DVLOG(1) << "WebRtcLocalAudioTrack::Stop()";
   if (!capturer_.get() && !webaudio_source_.get())
     return;
 
   if (webaudio_source_.get()) {
     // Called Stop() on the |webaudio_source_| explicitly so that
     // |webaudio_source_| won't push more data to the track anymore.
     // Also note that the track is not registered as a sink to the |capturer_|
     // in such case and no need to call RemoveTrack().
@@ skipping 17 matching lines @@
 
   for (SinkList::ItemList::const_iterator it = sinks.begin();
        it != sinks.end();
        ++it){
     (*it)->OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
     (*it)->Reset();
   }
 }
 
 }  // namespace content