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

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

Issue 1132203002: Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix incorrect test code that I accidentally committed. Created 5 years, 4 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 9cc092923d70bd74b74c590b11c1e4726562f9c6..600a75d659c197779c213a90541cca88fedf930e 100644
--- a/chrome/browser/media/webrtc_browsertest_base.h
+++ b/chrome/browser/media/webrtc_browsertest_base.h
@@ -46,6 +46,9 @@ class WebRtcTestBase : public InProcessBrowserTest {
// chrome/test/data/webrtc/getusermedia.js.
// If an error is reported back from the getUserMedia call, these functions
// will return false.
+ // The ...AndAccept()/...AndDeny()/...AndDismiss() functions expect that a
+ // prompt will be shown (i.e. the current origin in the tab_contents doesn't
+ // have a saved permission).
bool GetUserMediaAndAccept(content::WebContents* tab_contents) const;
bool GetUserMediaWithSpecificConstraintsAndAccept(
content::WebContents* tab_contents,
@@ -55,6 +58,10 @@ class WebRtcTestBase : public InProcessBrowserTest {
content::WebContents* tab_contents,
const std::string& constraints) const;
void GetUserMediaAndDismiss(content::WebContents* tab_contents) const;
+ void GetUserMediaAndExpectAutoAcceptWithoutPrompt(
+ content::WebContents* tab_contents) const;
+ void GetUserMediaAndExpectAutoDenyWithoutPrompt(
+ content::WebContents* tab_contents) const;
void GetUserMedia(content::WebContents* tab_contents,
const std::string& constraints) const;
« no previous file with comments | « chrome/browser/media/media_stream_infobar_delegate.cc ('k') | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698