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

Unified Diff: chrome/test/data/webrtc/getusermedia.js

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
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_common.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webrtc/getusermedia.js
diff --git a/chrome/test/data/webrtc/getusermedia.js b/chrome/test/data/webrtc/getusermedia.js
index 4307e60609e84321f4f1174f87497e6a68cb243e..b1af4944553918ceea8262b6929253db6bc5fc64 100644
--- a/chrome/test/data/webrtc/getusermedia.js
+++ b/chrome/test/data/webrtc/getusermedia.js
@@ -54,7 +54,8 @@ function doGetUserMedia(constraints) {
returnToTest('Browser does not support WebRTC.');
return;
}
- debug('Requesting doGetUserMedia: constraints: ' + constraints);
+ debug('Requesting doGetUserMedia: constraints: ' +
+ JSON.stringify(constraints, null, 0).replace(/[\r\n]/g, ''));
getUserMedia(constraints,
function(stream) {
ensureGotAllExpectedStreams_(stream, constraints);
@@ -73,7 +74,10 @@ function doGetUserMedia(constraints) {
*/
function obtainGetUserMediaResult() {
returnToTest(gRequestWebcamAndMicrophoneResult);
- return gRequestWebcamAndMicrophoneResult;
+ var ret = gRequestWebcamAndMicrophoneResult;
+ // Reset for the next call.
+ gRequestWebcamAndMicrophoneResult = 'not-called-yet';
tommi (sloooow) - chröme 2015/04/26 10:55:02 The problem we were hitting here is that when doin
phoglund_chromium 2015/04/27 07:46:48 Good catch. It's possible the re-set should actual
+ return ret;
}
/**
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_common.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698