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

Unified Diff: chrome/browser/media/webrtc_browsertest_base.h

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/webrtc_browsertest_base.h
diff --git a/chrome/browser/media/webrtc_browsertest_base.h b/chrome/browser/media/webrtc_browsertest_base.h
index 69aa4baeb0504e1e7b97a74183c66a20ea786697..9cb7ce11839f32fc33e8997c08705ffe3616ab36 100644
--- a/chrome/browser/media/webrtc_browsertest_base.h
+++ b/chrome/browser/media/webrtc_browsertest_base.h
@@ -42,9 +42,11 @@ class WebRtcTestBase : public InProcessBrowserTest {
~WebRtcTestBase() override;
// These all require that the loaded page fulfills the public interface in
- // chrome/test/data/webrtc/message_handling.js.
- void GetUserMediaAndAccept(content::WebContents* tab_contents) const;
- void GetUserMediaWithSpecificConstraintsAndAccept(
+ // chrome/test/data/webrtc/getusermedia.js.
+ // If an error is reported back from the getUserMedia call, these functions
+ // will return false.
+ bool GetUserMediaAndAccept(content::WebContents* tab_contents) const;
+ bool GetUserMediaWithSpecificConstraintsAndAccept(
content::WebContents* tab_contents,
const std::string& constraints) const;
void GetUserMediaAndDeny(content::WebContents* tab_contents);
@@ -106,7 +108,7 @@ class WebRtcTestBase : public InProcessBrowserTest {
// make that work). Looks at a 320x240 area of the target video tag.
void StartDetectingVideo(content::WebContents* tab_contents,
const std::string& video_element) const;
- void WaitForVideoToPlay(content::WebContents* tab_contents) const;
+ bool WaitForVideoToPlay(content::WebContents* tab_contents) const;
// Returns the stream size as a string on the format <width>x<height>.
std::string GetStreamSize(content::WebContents* tab_contents,

Powered by Google App Engine
This is Rietveld 408576698