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

media/audio/audio_input_controller.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.
 
 #ifndef MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/timer.h"
 #include "media/audio/audio_io.h"
-#include "media/audio/audio_manager.h"
+#include "media/audio/audio_manager_base.h"
 
 // An AudioInputController controls an AudioInputStream and records data
 // from this input stream. It has an important function that it executes
 // audio operations like record, pause, stop, etc. on a separate thread.
 //
 // All the public methods of AudioInputController are non-blocking except
 // close, the actual operations are performed on the audio input controller
 // thread.
 //
 // Here is a state diagram for the AudioInputController:
@@ skipping 61 matching lines @@
   // device will be created on the new thread and when that is done event
   // handler will receive a OnCreated() call.
   static scoped_refptr<AudioInputController> Create(
       EventHandler* event_handler,
       const AudioParameters& params);
 
   // Factory method for creating a low latency audio stream.
   static scoped_refptr<AudioInputController> CreateLowLatency(
       EventHandler* event_handler,
       const AudioParameters& params,
+      const std::string& device_id,
       // External synchronous reader for audio controller.
       SyncWriter* sync_writer);
 
   // Sets the factory used by the static method Create. AudioInputController
   // does not take ownership of |factory|. A value of NULL results in an
   // AudioInputController being created directly.
   static void set_factory_for_testing(Factory* factory) { factory_ = factory; }
   AudioInputStream* stream_for_testing() { return stream_; }
 
   // Starts recording in this audio input stream.
@@ skipping 22 matching lines @@
     kEmpty,
     kCreated,
     kRecording,
     kClosed,
     kError
   };
 
   AudioInputController(EventHandler* handler, SyncWriter* sync_writer);
 
   // The following methods are executed on the audio controller thread.
-  void DoCreate(const AudioParameters& params);
+  void DoCreate(const AudioParameters& params, const std::string& device_id);
   void DoRecord();
   void DoClose();
   void DoReportError(int code);
   void DoReportNoDataError();
   void DoResetNoDataTimer();
 
   EventHandler* handler_;
   AudioInputStream* stream_;
 
   // |no_data_timer_| is used to call DoReportNoDataError when we stop
@@ skipping 16 matching lines @@
   SyncWriter* sync_writer_;
 
   static Factory* factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_