Fix the race when the WebRtcAudioDeviceImpl goes away before capturers stop

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
index a50e17db3ac850bb08598e67c40844178f90b5e2..3f1f01b11cacc31e74539bc4fe15456c9d4742c9 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -447,9 +447,11 @@ void PeerConnectionDependencyFactory::CreateLocalAudioTrack(
 void PeerConnectionDependencyFactory::StartLocalAudioTrack(
     WebRtcLocalAudioTrack* audio_track) {
   // Add the WebRtcAudioDevice as the sink to the local audio track.
-  // TODO(xians): Implement a PeerConnection sink adapter and remove this
-  // AddSink() call.
-  audio_track->AddSink(GetWebRtcAudioDevice());
+  // TODO(xians): Remove the following line of code after the APM in WebRTC is

[henrika (OOO until Aug 14), 2014/06/03 11:00:15]

Link to crbug?

[no longer working on chromium, 2014/06/03 11:31:14]

Done.

+  // completely deprecated.
+  if (!MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled())
+    audio_track->AddSink(GetWebRtcAudioDevice());
+
   // Start the audio track. This will hook the |audio_track| to the capturer
   // as the sink of the audio, and only start the source of the capturer if
   // it is the first audio track connecting to the capturer.