Cleaned up the WebRtcAudioCapturer a bit.

content/renderer/media/media_stream_impl.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/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 712 matching lines @@
     bool notify_dispatcher) {
   MediaStreamSourceExtraData* extra_data =
         static_cast<MediaStreamSourceExtraData*> (source.extraData());
   CHECK(extra_data);
   DVLOG(1) << "MediaStreamImpl::StopLocalSource("
            << "{device_id = " << extra_data->device_info().device.id << "})";
 
   if (source.type() == blink::WebMediaStreamSource::TypeAudio) {
     if (extra_data->GetAudioCapturer()) {
       extra_data->GetAudioCapturer()->Stop();
+
+      // Remove the capturer object from the WebRtcAudioDeviceImpl after it
+      // stops.
+      WebRtcAudioDeviceImpl* audio_device =

[perkj_chrome, 2014/01/12 21:53:06]

Can this be moved to AudioCapturer::Stop instead? - ie - let the capturer know
what WebRtcAudioDeviceImpl it belongs to. It seems wrong that MediaStreamImpl
should have anything to do with this.  

+          dependency_factory_->GetWebRtcAudioDevice();
+      if (audio_device)
+        audio_device->RemoveAudioCapturer(extra_data->GetAudioCapturer());
     }
   }
 
   if (notify_dispatcher)
     media_stream_dispatcher_->StopStreamDevice(extra_data->device_info());
 
   blink::WebMediaStreamSource writable_source(source);
   writable_source.setReadyState(
       blink::WebMediaStreamSource::ReadyStateEnded);
   writable_source.setExtraData(NULL);
@@ skipping 52 matching lines @@
       session_id,
       buffer_size);
 }
 
 bool MediaStreamImpl::GetAuthorizedDeviceInfoForAudioRenderer(
     int* session_id,
     int* output_sample_rate,
     int* output_frames_per_buffer) {
   DCHECK(CalledOnValidThread());
 
-  WebRtcAudioDeviceImpl* audio_device =
-      dependency_factory_->GetWebRtcAudioDevice();
-  if (!audio_device)
+  // Loop through the sources and find out the capturer that can provide
+  // the paired device information for the audio renderer.
+  scoped_refptr<WebRtcAudioCapturer> capturer;
+  for (LocalStreamSources::const_iterator it = local_sources_.begin();

[perkj_chrome, 2014/01/12 21:53:06]

This is kind of backwards. We moved this info to the audio device in order to be
able to refactor render creation to a separate file and don't depend on
MediaStreamImpl. 
So, please don't depend on anything in MediaStreamImpl. 

[no longer working on chromium, 2014/01/13 16:59:59]

Done.

+       it != local_sources_.end(); ++it) {
+    MediaStreamSourceExtraData* extra_data =
+        static_cast<MediaStreamSourceExtraData*>(it->source.extraData());
+    if (it->source.type() == blink::WebMediaStreamSource::TypeAudio &&
+        extra_data->GetAudioCapturer() &&
+        !extra_data->GetAudioCapturer()->device_id().empty()) {

[perkj_chrome, 2014/01/12 21:53:06]

GetAudioCapturer()->device_id().empty() ? 
Can this be expressed in a different way if it is needed at all? 

[no longer working on chromium, 2014/01/13 16:59:59]

Remove now.

+      // If there are more than one open capture devices, return false because
+      // we have no way to pick an appropriate device.
+      if (capturer) {
+        DLOG(WARNING) << "Failed to get the authorized paired playout device "
+                      << "since there are more than one open capture devices.";
+        return false;
+      }
+      capturer = extra_data->GetAudioCapturer();
+    }
+  }
+
+  if (!capturer)
     return false;
 
-  if (!audio_device->GetDefaultCapturer())
-    return false;
-
-  return audio_device->GetDefaultCapturer()->GetPairedOutputParameters(
-      session_id,
-      output_sample_rate,
-      output_frames_per_buffer);
+  return capturer->GetPairedOutputParameters(session_id,
+                                             output_sample_rate,
+                                             output_frames_per_buffer);
 }
 
 MediaStreamSourceExtraData::MediaStreamSourceExtraData(
     const StreamDeviceInfo& device_info,
     const SourceStopCallback& stop_callback)
     : device_info_(device_info),
       stop_callback_(stop_callback) {
 }
 
 MediaStreamSourceExtraData::MediaStreamSourceExtraData() {
@@ skipping 35 matching lines @@
       enable_automatic_output_device_selection(
           enable_automatic_output_device_selection),
       frame(frame),
       request(request) {
 }
 
 MediaStreamImpl::UserMediaRequestInfo::~UserMediaRequestInfo() {
 }
 
 }  // namespace content