| Index: content/test/webrtc_audio_device_test.cc
|
| diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
|
| index b1326175c7e8375963d70cc36c9500455cebcfe3..d13f79caee818be476558f73c8bfd2be30fd5ef0 100644
|
| --- a/content/test/webrtc_audio_device_test.cc
|
| +++ b/content/test/webrtc_audio_device_test.cc
|
| @@ -212,24 +212,25 @@ void WebRTCAudioDeviceTest::DestroyChannel() {
|
| audio_input_renderer_host_ = NULL;
|
| }
|
|
|
| -void WebRTCAudioDeviceTest::OnGetHardwareSampleRate(double* sample_rate) {
|
| +void WebRTCAudioDeviceTest::OnGetHardwareSampleRate(int* sample_rate) {
|
| EXPECT_TRUE(audio_util_callback_);
|
| *sample_rate = audio_util_callback_ ?
|
| - audio_util_callback_->GetAudioHardwareSampleRate() : 0.0;
|
| + audio_util_callback_->GetAudioHardwareSampleRate() : 0;
|
| }
|
|
|
| -void WebRTCAudioDeviceTest::OnGetHardwareInputSampleRate(double* sample_rate) {
|
| +void WebRTCAudioDeviceTest::OnGetHardwareInputSampleRate(int* sample_rate) {
|
| EXPECT_TRUE(audio_util_callback_);
|
| *sample_rate = audio_util_callback_ ?
|
| audio_util_callback_->GetAudioInputHardwareSampleRate(
|
| - AudioManagerBase::kDefaultDeviceId) : 0.0;
|
| + AudioManagerBase::kDefaultDeviceId) : 0;
|
| }
|
|
|
| -void WebRTCAudioDeviceTest::OnGetHardwareInputChannelCount(uint32* channels) {
|
| +void WebRTCAudioDeviceTest::OnGetHardwareInputChannelLayout(
|
| + ChannelLayout* layout) {
|
| EXPECT_TRUE(audio_util_callback_);
|
| - *channels = audio_util_callback_ ?
|
| - audio_util_callback_->GetAudioInputHardwareChannelCount(
|
| - AudioManagerBase::kDefaultDeviceId) : 0;
|
| + *layout = audio_util_callback_ ?
|
| + audio_util_callback_->GetAudioInputHardwareChannelLayout(
|
| + AudioManagerBase::kDefaultDeviceId) : CHANNEL_LAYOUT_NONE;
|
| }
|
|
|
| // IPC::Channel::Listener implementation.
|
| @@ -264,8 +265,8 @@ bool WebRTCAudioDeviceTest::OnMessageReceived(const IPC::Message& message) {
|
| OnGetHardwareSampleRate)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareInputSampleRate,
|
| OnGetHardwareInputSampleRate)
|
| - IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareInputChannelCount,
|
| - OnGetHardwareInputChannelCount)
|
| + IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareInputChannelLayout,
|
| + OnGetHardwareInputChannelLayout)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP_EX()
|
|
|
|
|