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

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

Issue 1286363002: Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nits. 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/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 1daff0305230e5d35c93aa5cd54f5512820ac8c5..b13e12f76d981247adf5629384ba0de1b5828146 100644
--- a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
@@ -56,7 +56,8 @@ class WebRtcWebcamBrowserTest : public WebRtcTestBase,
std::string GetUserMediaAndGetStreamSize(content::WebContents* tab,
const std::string& constraints) {
std::string actual_stream_size;
- if (GetUserMediaWithSpecificConstraintsAndAccept(tab, constraints)) {
+ if (GetUserMediaWithSpecificConstraintsAndAcceptIfPrompted(tab,
+ constraints)) {
StartDetectingVideo(tab, "local-view");
if (WaitForVideoToPlay(tab))
actual_stream_size = GetStreamSize(tab, "local-view");

Powered by Google App Engine
This is Rietveld 408576698