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

Unified Diff: content/renderer/media/webrtc/processed_local_audio_source_unittest.cc

Issue 2623443002: Fix getUserMedia so that failure is reported for invalid audio sources. (Closed)
Patch Set: Address comments Created 3 years, 11 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
Index: content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
diff --git a/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc b/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
index 1109424546a775930677afe7ea30571e4f1db653..390aeafacb9618304f8fadb303fadf1f0f0c3dda 100644
--- a/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
+++ b/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
@@ -102,9 +102,11 @@ class ProcessedLocalAudioSourceTest : public testing::Test {
StreamDeviceInfo(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device",
"mock_audio_device_id", kSampleRate, kChannelLayout,
kRequestedBufferSize),
+ constraints,
+ base::Bind(&ProcessedLocalAudioSourceTest::OnAudioSourceStarted,
+ base::Unretained(this)),
&mock_dependency_factory_);
source->SetAllowInvalidRenderFrameIdForTesting(true);
- source->SetSourceConstraints(constraints);
blink_audio_source_.setExtraData(source); // Takes ownership.
}
@@ -137,6 +139,10 @@ class ProcessedLocalAudioSourceTest : public testing::Test {
return blink_audio_track_;
}
+ void OnAudioSourceStarted(MediaStreamSource* source,
+ MediaStreamRequestResult result,
+ const blink::WebString& result_name) {}
+
private:
base::MessageLoop main_thread_message_loop_; // Needed for MSAudioProcessor.
MockAudioDeviceFactory mock_audio_device_factory_;
@@ -168,7 +174,10 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) {
.WillOnce(WithArg<0>(Invoke(this, &ThisTest::CheckSourceFormatMatches)));
EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(),
SetAutomaticGainControl(true));
- EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(), Start());
+ EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(), Start())
+ .WillOnce(Invoke(
+ capture_source_callback(),
+ &media::AudioCapturerSource::CaptureCallback::OnCaptureStarted));
ASSERT_TRUE(audio_source()->ConnectToTrack(blink_audio_track()));
CheckOutputFormatMatches(audio_source()->GetAudioParameters());

Powered by Google App Engine
This is Rietveld 408576698