Update MediaStreamTrack::Stop to latest draft.

content/renderer/media/media_stream_audio_source.cc

 // Copyright 2014 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_audio_source.h"
 
 namespace content {
 
 MediaStreamAudioSource::MediaStreamAudioSource(
     int render_view_id,
@@ skipping 16 matching lines @@
 void MediaStreamAudioSource::DoStopSource() {
   if (audio_capturer_.get())
     audio_capturer_->Stop();
 }
 
 void MediaStreamAudioSource::AddTrack(
     const blink::WebMediaStreamTrack& track,
     const blink::WebMediaConstraints& constraints,
     const ConstraintsCallback& callback) {
   // TODO(xians): Properly implement for audio sources.
-  if (!factory_)
-    callback.Run(this, false);
+  CHECK(factory_);
 
-  bool result = true;
   if (!local_audio_source_) {
-    result = factory_->InitializeMediaStreamAudioSource(render_view_id_,
-                                                        constraints,
-                                                        this);
+    if(!factory_->InitializeMediaStreamAudioSource(render_view_id_,

[no longer working on chromium, 2014/04/15 10:33:28]

nit, add an empty space.

[perkj_chrome, 2014/04/15 11:00:44]

Done.

+                                                   constraints,
+                                                   this)) {
+      // The source failed to start.
+      // MediaStreamImpl rely on the |stop_callback| to be triggered when the
+      // last track is removed from the source. But in this case, the source is
+      // is not even started. So we need to fail both adding the track and
+      // trigger |stop_callback|.
+      callback.Run(this, false);
+      StopSource();
+      return;
+    }
   }

[no longer working on chromium, 2014/04/15 10:33:28]

add, add an empty line.

[perkj_chrome, 2014/04/15 11:00:44]

Done.

-  if (result)
-    factory_->CreateLocalAudioTrack(track);
-  callback.Run(this, result);
+  factory_->CreateLocalAudioTrack(track);
+  callback.Run(this, true);
 }
 
 }  // namespace content