MediaStream audio object graph untangling and clean-ups.

content/public/renderer/media_stream_audio_sink.cc

Index: content/public/renderer/media_stream_audio_sink.cc
diff --git a/content/public/renderer/media_stream_audio_sink.cc b/content/public/renderer/media_stream_audio_sink.cc
index ad075d17c0b401fd17b41b949249cb1616f9a1b5..ceb2718de47786cee9ee8b482e2feca75e95f4f5 100644
--- a/content/public/renderer/media_stream_audio_sink.cc
+++ b/content/public/renderer/media_stream_audio_sink.cc
@@ -15,21 +15,27 @@ void MediaStreamAudioSink::AddToAudioTrack(
     MediaStreamAudioSink* sink,
     const blink::WebMediaStreamTrack& track) {
   DCHECK(track.source().getType() == blink::WebMediaStreamSource::TypeAudio);
-  MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track);
-  native_track->AddSink(sink);
+  if (MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::From(track))

[tommi (sloooow) - chröme, 2016/03/03 11:07:30]

is the if() necessary?  It seems like we would previously crash in both release
and debug builds if we'd ever have a problem here but now we silently ignore it
in release builds (official anyway).

[miu, 2016/03/05 02:55:30]

Ah, I did a little too much here perhaps.  Changed these to just add DCHECKs.

+    native_track->AddSink(sink);
+  else
+    NOTREACHED();
 }
 
 void MediaStreamAudioSink::RemoveFromAudioTrack(
     MediaStreamAudioSink* sink,
     const blink::WebMediaStreamTrack& track) {
-  MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track);
-  native_track->RemoveSink(sink);
+  if (MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::From(track))
+    native_track->RemoveSink(sink);
+  else
+    NOTREACHED();
 }
 
 media::AudioParameters MediaStreamAudioSink::GetFormatFromAudioTrack(
     const blink::WebMediaStreamTrack& track) {
-  MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track);
-  return native_track->GetOutputFormat();
+  if (MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::From(track))
+    return native_track->GetOutputFormat();
+  NOTREACHED();
+  return media::AudioParameters();
 }
 
 }  // namespace content