| Index: content/renderer/media/webrtc_audio_device_unittest.cc
|
| diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc
|
| index 12ce533c458961f99a0f342575ea301aacc85ed4..d989864317981cd68fba3fd10d0629e9a7fffe57 100644
|
| --- a/content/renderer/media/webrtc_audio_device_unittest.cc
|
| +++ b/content/renderer/media/webrtc_audio_device_unittest.cc
|
| @@ -512,20 +512,10 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_StartPlayout) {
|
| scoped_ptr<media::AudioHardwareConfig> config =
|
| CreateRealHardwareConfig(audio_manager_.get());
|
| SetAudioHardwareConfig(config.get());
|
| - media::AudioParameters params(config->GetOutputConfig());
|
|
|
| if (!HardwareSampleRatesAreValid())
|
| return;
|
|
|
| - EXPECT_CALL(media_observer(),
|
| - OnAudioStreamCreated(_, 1, params, StrEq(""))).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamPlaying(_, 1, true)).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamStatus(_, 1, StrEq("closed"))).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnDeleteAudioStream(_, 1)).Times(AnyNumber());
|
| -
|
| WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create());
|
| ASSERT_TRUE(engine.valid());
|
| ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
|
| @@ -698,20 +688,10 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_PlayLocalFile) {
|
| scoped_ptr<media::AudioHardwareConfig> config =
|
| CreateRealHardwareConfig(audio_manager_.get());
|
| SetAudioHardwareConfig(config.get());
|
| - media::AudioParameters params(config->GetOutputConfig());
|
|
|
| if (!HardwareSampleRatesAreValid())
|
| return;
|
|
|
| - EXPECT_CALL(media_observer(),
|
| - OnAudioStreamCreated(_, 1, params, StrEq(""))).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamPlaying(_, 1, true)).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamStatus(_, 1, StrEq("closed"))).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnDeleteAudioStream(_, 1)).Times(AnyNumber());
|
| -
|
| WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create());
|
| ASSERT_TRUE(engine.valid());
|
| ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
|
| @@ -779,20 +759,10 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_FullDuplexAudioWithAGC) {
|
| scoped_ptr<media::AudioHardwareConfig> config =
|
| CreateRealHardwareConfig(audio_manager_.get());
|
| SetAudioHardwareConfig(config.get());
|
| - media::AudioParameters params(config->GetOutputConfig());
|
|
|
| if (!HardwareSampleRatesAreValid())
|
| return;
|
|
|
| - EXPECT_CALL(media_observer(),
|
| - OnAudioStreamCreated(_, 1, params, StrEq(""))).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamPlaying(_, 1, true));
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamStatus(_, 1, StrEq("closed")));
|
| - EXPECT_CALL(media_observer(),
|
| - OnDeleteAudioStream(_, 1)).Times(AnyNumber());
|
| -
|
| WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create());
|
| ASSERT_TRUE(engine.valid());
|
| ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
|
| @@ -933,20 +903,10 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_WebRtcPlayoutSetupTime) {
|
| scoped_ptr<media::AudioHardwareConfig> config =
|
| CreateRealHardwareConfig(audio_manager_.get());
|
| SetAudioHardwareConfig(config.get());
|
| - media::AudioParameters params(config->GetOutputConfig());
|
|
|
| if (!HardwareSampleRatesAreValid())
|
| return;
|
|
|
| - EXPECT_CALL(media_observer(),
|
| - OnAudioStreamCreated(_, 1, params, StrEq(""))).Times(1);
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamStatus(_, 1, _)).Times(AnyNumber());
|
| - EXPECT_CALL(media_observer(),
|
| - OnSetAudioStreamPlaying(_, 1, true));
|
| - EXPECT_CALL(media_observer(),
|
| - OnDeleteAudioStream(_, 1)).Times(AnyNumber());
|
| -
|
| base::WaitableEvent event(false, false);
|
| scoped_ptr<MockWebRtcAudioRendererSource> renderer_source(
|
| new MockWebRtcAudioRendererSource(&event));
|
|
|