Link things together and enable the device selection for linux and mac.

content/browser/renderer_host/media/audio_input_renderer_host.cc

 // Copyright (c) 2011 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/browser/renderer_host/media/audio_input_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 184 matching lines @@
 
   // Add the session entry to the map.
   session_entries_[session_id] = stream_id;
 
   // Start the device with the session_id. If the device is started
   // successfully, OnDeviceStarted() callback will be triggered.
   audio_input_man->Start(session_id, this);
 }
 
 void AudioInputRendererHost::OnCreateStream(
-    int stream_id, const AudioParameters& params, bool low_latency) {
+    int stream_id, const AudioParameters& params, bool low_latency,
+    const std::string& device_uid) {
   VLOG(1) << "AudioInputRendererHost::OnCreateStream(stream_id="
           << stream_id << ")";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(stream_id) == NULL);
 
   // Prevent the renderer process from asking for a normal-latency
   // input stream.
   if (!low_latency) {
     NOTREACHED() << "Current implementation only supports low-latency mode.";
     return;
@@ skipping 21 matching lines @@
 
   // Then try to initialize the sync writer.
   if (!writer->Init()) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // If we have successfully created the SyncWriter then assign it to the
   // entry and construct an AudioInputController.
   entry->writer.reset(writer.release());
-  entry->controller =
-      media::AudioInputController::CreateLowLatency(this,
-                                                    audio_params,
-                                                    entry->writer.get());
+  entry->controller = media::AudioInputController::CreateLowLatency(
+      this,
+      audio_params,
+      device_uid,
+      entry->writer.get());
 
   if (!entry->controller) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // If we have created the controller successfully create a entry and add it
   // to the map.
   entry->stream_id = stream_id;
 
@@ skipping 60 matching lines @@
 
 void AudioInputRendererHost::DeleteEntries() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     CloseAndDeleteStream(i->second);
   }
 }
 
-void AudioInputRendererHost::OnDeviceStarted(int session_id, int index) {
+void AudioInputRendererHost::OnDeviceStarted(
+    int session_id, const std::string& device_uid) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   SessionEntryMap::iterator it = session_entries_.find(session_id);
   if (it == session_entries_.end()) {
     DLOG(WARNING) << "AudioInputRendererHost::OnDeviceStarted()"
         " session does not exist.";
     return;
   }
 
   // Notify the renderer that the device has been started.

[henrika (OOO until Aug 14), 2011/11/16 13:24:02]

Perhaps make the comment more clear since the device is actually not really
started. Just verified.

[no longer working on chromium, 2011/11/16 17:45:48]

Done.

-  Send(new AudioInputMsg_NotifyDeviceStarted(it->second, index));
+  Send(new AudioInputMsg_NotifyDeviceStarted(it->second, device_uid));
 }
 
 void AudioInputRendererHost::OnDeviceStopped(int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   SessionEntryMap::iterator it = session_entries_.find(session_id);
   // Return if the stream has been closed.
   if (it == session_entries_.end())
     return;
 
@@ skipping 88 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (SessionEntryMap::iterator it = session_entries_.begin();
        it != session_entries_.end(); ++it) {
     if (stream_id == it->second) {
       return it->first;
     }
   }
   return 0;
 }