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

Unified Diff: chrome/browser/media/chrome_media_stream_infobar_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_media_stream_infobar_browsertest.cc
diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
index d06a595e620c1fcd22d1e7351bc52e147060a0db..b307d07482aa8b922de8ff98a3df4a48bebff84b 100644
--- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
+++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
@@ -106,7 +106,7 @@ class MediaStreamInfoBarTest : public WebRtcTestBase {
IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, TestAllowingUserMedia) {
content::WebContents* tab_contents = LoadTestPageInTab();
- GetUserMediaAndAccept(tab_contents);
+ EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
}
IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, TestDenyingUserMedia) {
@@ -135,7 +135,7 @@ IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
content::WebContents* tab_contents = LoadTestPageInTab();
- GetUserMediaAndAccept(tab_contents);
+ EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
GetUserMediaAndDeny(tab_contents);
// Should fail with permission denied right away with no infobar popping up.
@@ -153,8 +153,8 @@ IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, TestAcceptIsNotSticky) {
// If accept were sticky the second call would hang because it hangs if an
// infobar does not pop up.
- GetUserMediaAndAccept(tab_contents);
- GetUserMediaAndAccept(tab_contents);
+ EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
+ EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
}
IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, TestDismissIsNotSticky) {
@@ -198,8 +198,8 @@ IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
// If mic blocking also blocked cameras, the second call here would hang.
GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
kAudioOnlyCallConstraints);
- GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
- kVideoOnlyCallConstraints);
+ EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
+ tab_contents, kVideoOnlyCallConstraints));
}
IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
@@ -209,6 +209,6 @@ IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
// If camera blocking also blocked mics, the second call here would hang.
GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
kVideoOnlyCallConstraints);
- GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
- kAudioOnlyCallConstraints);
+ EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
+ tab_contents, kAudioOnlyCallConstraints));
}

Powered by Google App Engine
This is Rietveld 408576698