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

content/common/media/audio_messages.h

Index: content/common/media/audio_messages.h
diff --git a/content/common/media/audio_messages.h b/content/common/media/audio_messages.h
index 3499258c692f50f481f50abaed1f5321bedb2f35..2183ce5613612278601e53d76166b322ad319475 100644
--- a/content/common/media/audio_messages.h
+++ b/content/common/media/audio_messages.h
@@ -5,6 +5,7 @@
 // IPC messages for the audio.
 // Multiply-included message file, hence no include guard.
 
+#include "base/basictypes.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "content/common/media/audio_stream_state.h"
@@ -103,7 +104,7 @@ IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume,
 
 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted,
                      int /* stream id */,
-                     int /* device_index */)
+                     std::string /* device_uid */)
 
 // Messages sent from the renderer to the browser.
 
@@ -114,10 +115,11 @@ IPC_MESSAGE_CONTROL3(AudioHostMsg_CreateStream,
                      bool /* low-latency */)
 
 // Request that got sent to browser for creating an audio input stream
-IPC_MESSAGE_CONTROL3(AudioInputHostMsg_CreateStream,
+IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream,
                      int /* stream_id */,
                      AudioParameters /* params */,
-                     bool /* low-latency */)
+                     bool /* low-latency */,
+                     std::string /* device_uid */)
 
 // Tell the browser the audio buffer prepared for stream (stream_id) is
 // filled and is ready to be consumed.