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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 11428073: Wrote audio- and video-only WebRTC call tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | chrome/test/functional/webrtc_call.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 47036a383d9ad8c1c5622eaaae314a1f84401187..8c04533a26fe6ddf86c7b9b32fd803b4265d2b3d 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -2258,8 +2258,15 @@ void TestingAutomationProvider::PerformActionOnInfobar(
media_stream_infobar->GetVideoDevices();
content::MediaStreamDevices audio_devices =
media_stream_infobar->GetAudioDevices();
- if (video_devices.empty() || audio_devices.empty()) {
- reply.SendError("No available audio/video devices to autoselect.");
+
phoglund_chromium 2012/11/29 10:11:36 HasVideo() == true -> web page actually requested
+ if (media_stream_infobar->HasVideo() && video_devices.empty()) {
+ reply.SendError("Requested video, but there are no video "
+ "devices on the system.");
+ return;
+ }
+ if (media_stream_infobar->HasAudio() && audio_devices.empty()) {
+ reply.SendError("Requested audio, but there are no audio "
+ "devices on the system.");
return;
}
« no previous file with comments | « no previous file | chrome/test/functional/webrtc_call.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698