chrome/browser/media/chrome_webrtc_webcam_browsertest.cc - Issue 1286363002: Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix test. 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

« chrome/browser/media/chrome_media_stream_infobar_browsertest.cc ('K') | « chrome/browser/media/chrome_media_stream_infobar_browsertest.cc ('k') | chrome/browser/media/desktop_capture_access_handler.cc » ('j') | chrome/browser/media/webrtc_browsertest_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..2d9647e19577787ed3f65114b5cce3a5f4f6794f 100644

--- a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc

+++ b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc

@@ -56,7 +56,7 @@ 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)) {

tommi (sloooow) - chröme 2015/08/13 13:03:17 is this still within 80? (just checking)

lgarron 2015/08/13 20:30:01 Good catch! It seems I forgot to run `git cl forma

StartDetectingVideo(tab, "local-view");

if (WaitForVideoToPlay(tab))

actual_stream_size = GetStreamSize(tab, "local-view");