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/14 08:42:40]

What is the lifetime of audio_device? How about letting this be internal to
AudioCapturer::Stop.

[no longer working on chromium, 2014/01/14 11:10:21]

Sorry, I just forgot the save the change in this file, these lines of code
should have been removed.

FYI, the audio_device is scoped_ptr owned by the dependency_factory, and it will
go away when the dependency_factory goes away.

+          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 51 matching lines @@
       RenderViewObserver::routing_id(),
       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)
     return false;
 
-  if (!audio_device->GetDefaultCapturer())
-    return false;
-
-  return audio_device->GetDefaultCapturer()->GetPairedOutputParameters(
-      session_id,
-      output_sample_rate,
-      output_frames_per_buffer);
+  return audio_device->GetAuthorizedDeviceInfoForAudioRenderer(
+      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