Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(712)

Unified Diff: content/renderer/media/webrtc_audio_device_unittest.cc

Issue 81953002: Remove MockMediaInternals and incestuous usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix shutdown. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/media/mock_media_observer.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « content/browser/renderer_host/media/mock_media_observer.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698