Cleaned up the WebRtcAudioCapturer a bit.

content/renderer/media/webrtc_audio_device_impl.cc

 // Copyright 2013 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/webrtc_audio_device_impl.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
@@ skipping 418 matching lines @@
 
   renderer_ = renderer;
   return true;
 }
 
 void WebRtcAudioDeviceImpl::AddAudioCapturer(
     const scoped_refptr<WebRtcAudioCapturer>& capturer) {
   DVLOG(1) << "WebRtcAudioDeviceImpl::AddAudioCapturer()";
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(capturer.get());
+  DCHECK(!capturer->device_id().empty());
+  base::AutoLock auto_lock(lock_);
+  DCHECK(std::find(capturers_.begin(), capturers_.end(), capturer) ==
+      capturers_.end());
+  capturers_.push_back(capturer);
+}
 
-  // We only support one microphone today, which means the list can contain
-  // only one capturer with a valid device id.
-  DCHECK(capturer->device_id().empty() || !GetDefaultCapturer());
+void WebRtcAudioDeviceImpl::RemoveAudioCapturer(
+    const scoped_refptr<WebRtcAudioCapturer>& capturer) {
+  DVLOG(1) << "WebRtcAudioDeviceImpl::AddAudioCapturer()";
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(capturer.get());
   base::AutoLock auto_lock(lock_);
-  capturers_.push_back(capturer);
+  capturers_.remove(capturer);
 }
 
 scoped_refptr<WebRtcAudioCapturer>
 WebRtcAudioDeviceImpl::GetDefaultCapturer() const {
   base::AutoLock auto_lock(lock_);
-  for (CapturerList::const_iterator iter = capturers_.begin();
-       iter != capturers_.end(); ++iter) {
-    if (!(*iter)->device_id().empty())
-      return *iter;
+  // Use the last |capturer| which is from the latest getUserMedia call as
+  // the default capture device.
+  for (CapturerList::const_reverse_iterator iter = capturers_.rbegin();

[perkj_chrome, 2014/01/14 12:53:55]

return capturers_.empty() ? NULL : capturers_[capturers.size() -1];  

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

Done.

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

capturers_ is a list whose element can't be access via indexing.
Is it fine to keep this? otherwise I need to switch it to a vector.

[perkj_chrome, 2014/01/14 20:27:32]

sure. You can also use *(capturers_.end()--) instead of an index.

[no longer working on chromium, 2014/01/15 18:31:03]

I would like to use the existing approach since it is a bit more readable. Hope
it is fine.

+       iter != capturers_.rend(); ++iter) {
+    return *iter;
   }
 
   return NULL;
 }
 
+bool WebRtcAudioDeviceImpl::GetAuthorizedDeviceInfoForAudioRenderer(
+    int* session_id,
+    int* output_sample_rate,
+    int* output_frames_per_buffer) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  // If there is no capturer or there are more than one open capture devices,
+  // return false.
+  if (capturers_.empty() || capturers_.size() > 1)
+    return false;
+
+  return GetDefaultCapturer()->GetPairedOutputParameters(
+      session_id, output_sample_rate, output_frames_per_buffer);
+}
+
 }  // namespace content