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

content/browser/renderer_host/media/audio_input_renderer_host.h

 // 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.
 //
 // AudioInputRendererHost serves audio related requests from audio capturer
 // which lives inside the render process and provide access to audio hardware.
 //
 // OnCreateStream() request is only available in the low latency mode. It will
 // creates a shared memory, a SyncWriter and a AudioInputController for the
 // input stream.
 
 // OnCloseStream() will close the input stream.
 //
 // Create stream sequence:
 //
 // OnCreateStream -> AudioInputController::CreateLowLatency() ->
 // DoCompleteCreation -> AudioInputMsg_NotifyLowLatencyStreamCreated
 //
 // Close stream sequence:
 // OnCloseStream -> AudioInputController::Close
 //
 // For the OnStartDevice() request, AudioInputRendererHost starts the device
-// referenced by the session id, and a OnDeviceStarted() callback with the
-// index of the opened device will be received later. Then it will send a IPC
-// message to notify the renderer that the device is ready, so that renderer
-// can continue with the OnCreateStream() request.
+// referenced by the session id, and an OnDeviceStarted() callback with the
+// id of the opened device will be received later. Then it will send a
+// IPC message to notify the renderer that the device is ready, so that
+// renderer can continue with the OnCreateStream() request.
 //
 // OnDeviceStopped() is called when the user closes the device through
 // AudioInputDeviceManager without calling Stop() before. What
 // AudioInputRenderHost::OnDeviceStopped() does is to send a IPC mesaage to
 // notify the renderer in order to stop the stream.
 //
 // Start device sequence:
 //
 // OnStartDevice -> AudioInputDeviceManager::Start ->
 // AudioInputDeviceManagerEventHandler::OnDeviceStarted ->
@@ skipping 78 matching lines @@
   // AudioInputController::EventHandler implementation.
   virtual void OnCreated(media::AudioInputController* controller) OVERRIDE;
   virtual void OnRecording(media::AudioInputController* controller) OVERRIDE;
   virtual void OnError(media::AudioInputController* controller,
                        int error_code) OVERRIDE;
   virtual void OnData(media::AudioInputController* controller,
                       const uint8* data,
                       uint32 size) OVERRIDE;
 
   // media_stream::AudioInputDeviceManagerEventHandler implementation.
-  virtual void OnDeviceStarted(int session_id, int index) OVERRIDE;
-  virtual void OnDeviceStopped(int session_id) OVERRIDE;
+  virtual void OnDeviceStarted(int session_id, const std::string& device_id);
+  virtual void OnDeviceStopped(int session_id);
 
  private:
   // TODO(henrika): extend test suite (compare AudioRenderHost)
   friend class content::BrowserThread;
   friend class DeleteTask<AudioInputRendererHost>;
 
   virtual ~AudioInputRendererHost();
 
   // Methods called on IO thread ----------------------------------------------
 
   // Start the audio input device with the session id. If the device
   // starts successfully, it will trigger OnDeviceStarted() callback.
   void OnStartDevice(int stream_id, int session_id);
 
   // Audio related IPC message handlers.
   // Creates an audio input stream with the specified format. If this call is
   // successful this object would keep an internal entry of the stream for the
   // required properties.
   void OnCreateStream(int stream_id,
                       const AudioParameters& params,
-                      bool low_latency);
+                      bool low_latency,
+                      const std::string& device_id);
 
   // Record the audio input stream referenced by |stream_id|.
   void OnRecordStream(int stream_id);
 
   // Close the audio stream referenced by |stream_id|.
   void OnCloseStream(int stream_id);
 
   // Set the volume of the audio stream referenced by |stream_id|.
   void OnSetVolume(int stream_id, double volume);
 
@@ skipping 54 matching lines @@
   AudioEntryMap audio_entries_;
 
   // A map of session IDs to audio session sources.
   typedef std::map<int, int> SessionEntryMap;
   SessionEntryMap session_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputRendererHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_RENDERER_HOST_H_