Index: content/renderer/media/audio_input_device.cc |
diff --git a/content/renderer/media/audio_input_device.cc b/content/renderer/media/audio_input_device.cc |
index 24e9da923a14f3f8ad72d060fe3381fcb28efb51..33725f9be7618e8ba6632042418ae9450e840514 100644 |
--- a/content/renderer/media/audio_input_device.cc |
+++ b/content/renderer/media/audio_input_device.cc |
@@ -21,7 +21,7 @@ |
class AudioInputDevice::AudioThreadCallback |
: public AudioDeviceThread::Callback { |
public: |
- AudioThreadCallback(const AudioParameters& audio_parameters, |
+ AudioThreadCallback(const media::AudioParameters& audio_parameters, |
base::SharedMemoryHandle memory, |
int memory_length, |
CaptureCallback* capture_callback); |
@@ -37,7 +37,7 @@ class AudioInputDevice::AudioThreadCallback |
DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback); |
}; |
-AudioInputDevice::AudioInputDevice(const AudioParameters& params, |
+AudioInputDevice::AudioInputDevice(const media::AudioParameters& params, |
CaptureCallback* callback, |
CaptureEventHandler* event_handler) |
: ScopedLoopObserver(ChildProcess::current()->io_message_loop()), |
@@ -104,7 +104,8 @@ void AudioInputDevice::InitializeOnIOThread() { |
// and create the stream when getting a OnDeviceReady() callback. |
if (!session_id_) { |
Send(new AudioInputHostMsg_CreateStream( |
- stream_id_, audio_parameters_, AudioManagerBase::kDefaultDeviceId)); |
+ stream_id_, audio_parameters_, |
+ media::AudioManagerBase::kDefaultDeviceId)); |
} else { |
Send(new AudioInputHostMsg_StartDevice(stream_id_, session_id_)); |
pending_device_ready_ = true; |
@@ -270,7 +271,7 @@ void AudioInputDevice::WillDestroyCurrentMessageLoop() { |
// AudioInputDevice::AudioThreadCallback |
AudioInputDevice::AudioThreadCallback::AudioThreadCallback( |
- const AudioParameters& audio_parameters, |
+ const media::AudioParameters& audio_parameters, |
base::SharedMemoryHandle memory, |
int memory_length, |
CaptureCallback* capture_callback) |