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

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

Issue 23731007: Implicit audio output device selection for getUserMedia. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 3 months 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/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/webrtc_audio_renderer.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 ac41e4f4b00d9e88eb39d179ba0126a14df84a1a..5013103a03138d010d9c30158de6f1f612cfee3f 100644
--- a/content/renderer/media/webrtc_audio_device_unittest.cc
+++ b/content/renderer/media/webrtc_audio_device_unittest.cc
@@ -547,8 +547,9 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_StartPlayout) {
ch, webrtc::kPlaybackPerChannel, *media_process.get()));
EXPECT_EQ(0, base->StartPlayout(ch));
- scoped_refptr<WebRtcAudioRenderer> renderer =
- new WebRtcAudioRenderer(kRenderViewId);
+ scoped_refptr<WebRtcAudioRenderer> renderer(
+ CreateDefaultWebRtcAudioRenderer(kRenderViewId));
+
EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer.get()));
renderer->Play();
@@ -722,8 +723,8 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_PlayLocalFile) {
int ch = base->CreateChannel();
EXPECT_NE(-1, ch);
EXPECT_EQ(0, base->StartPlayout(ch));
- scoped_refptr<WebRtcAudioRenderer> renderer =
- new WebRtcAudioRenderer(kRenderViewId);
+ scoped_refptr<WebRtcAudioRenderer> renderer(
+ CreateDefaultWebRtcAudioRenderer(kRenderViewId));
EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer.get()));
renderer->Play();
@@ -832,8 +833,8 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_FullDuplexAudioWithAGC) {
EXPECT_EQ(0, network->RegisterExternalTransport(ch, *transport.get()));
EXPECT_EQ(0, base->StartPlayout(ch));
EXPECT_EQ(0, base->StartSend(ch));
- scoped_refptr<WebRtcAudioRenderer> renderer =
- new WebRtcAudioRenderer(kRenderViewId);
+ scoped_refptr<WebRtcAudioRenderer> renderer(
+ CreateDefaultWebRtcAudioRenderer(kRenderViewId));
EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer.get()));
renderer->Play();
@@ -943,8 +944,9 @@ TEST_F(MAYBE_WebRTCAudioDeviceTest, MAYBE_WebRtcPlayoutSetupTime) {
base::WaitableEvent event(false, false);
scoped_ptr<MockWebRtcAudioRendererSource> renderer_source(
new MockWebRtcAudioRendererSource(&event));
- scoped_refptr<WebRtcAudioRenderer> renderer =
- new WebRtcAudioRenderer(kRenderViewId);
+
+ scoped_refptr<WebRtcAudioRenderer> renderer(
+ CreateDefaultWebRtcAudioRenderer(kRenderViewId));
renderer->Initialize(renderer_source.get());
// Start the timer and playout.
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/webrtc_audio_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698