MediaStream audio object graph untangling and clean-ups.

content/renderer/media/webrtc/media_stream_remote_audio_track.cc

Index: content/renderer/media/webrtc/media_stream_remote_audio_track.cc
diff --git a/content/renderer/media/webrtc/media_stream_remote_audio_track.cc b/content/renderer/media/webrtc/media_stream_remote_audio_track.cc
index e1b52883e82281dc496d55d1462741ca1bf6a048..d03c80676ea49e8453b7d402c61dab2fdf98b927 100644
--- a/content/renderer/media/webrtc/media_stream_remote_audio_track.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_audio_track.cc
@@ -120,7 +120,8 @@ MediaStreamRemoteAudioTrack::MediaStreamRemoteAudioTrack(
 
 MediaStreamRemoteAudioTrack::~MediaStreamRemoteAudioTrack() {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
-  source()->RemoveAll(this);
+  // Ensure the track is stopped.
+  MediaStreamAudioTrack::Stop();
 }
 
 void MediaStreamRemoteAudioTrack::SetEnabled(bool enabled) {
@@ -139,8 +140,12 @@ void MediaStreamRemoteAudioTrack::SetEnabled(bool enabled) {
   source()->SetSinksEnabled(this, enabled);
 }
 
-void MediaStreamRemoteAudioTrack::Stop() {
+void MediaStreamRemoteAudioTrack::OnStop() {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
+  DVLOG(1) << "MediaStreamRemoteAudioTrack::OnStop()";
+
+  source()->RemoveAll(this);
+
   // Stop means that a track should be stopped permanently. But
   // since there is no proper way of doing that on a remote track, we can
   // at least disable the track. Blink will not call down to the content layer