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

Unified Diff: chrome/browser/media/chrome_webrtc_webcam_browsertest.cc

Issue 1061473002: Make WebRtcWebcamBrowserTest fail faster. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix issue in js code and improve logging of constraints Created 5 years, 8 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: chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
index 5f4a3eaa0e66ebf3df5d83ae3bf8be04735ef8c9..1daff0305230e5d35c93aa5cd54f5512820ac8c5 100644
--- a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
@@ -55,12 +55,13 @@ class WebRtcWebcamBrowserTest : public WebRtcTestBase,
std::string GetUserMediaAndGetStreamSize(content::WebContents* tab,
const std::string& constraints) {
- GetUserMediaWithSpecificConstraintsAndAccept(tab, constraints);
-
- StartDetectingVideo(tab, "local-view");
- WaitForVideoToPlay(tab);
- std::string actual_stream_size = GetStreamSize(tab, "local-view");
- CloseLastLocalStream(tab);
+ std::string actual_stream_size;
+ if (GetUserMediaWithSpecificConstraintsAndAccept(tab, constraints)) {
+ StartDetectingVideo(tab, "local-view");
+ if (WaitForVideoToPlay(tab))
+ actual_stream_size = GetStreamSize(tab, "local-view");
+ CloseLastLocalStream(tab);
+ }
return actual_stream_size;
}

Powered by Google App Engine
This is Rietveld 408576698