content/browser/media/webrtc/webrtc_webcam_browsertest.cc - Issue 2052633002: Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

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: content/browser/media/webrtc/webrtc_webcam_browsertest.cc

Issue 2052633002: Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix induced script bug. Created 4 years, 6 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

« no previous file with comments | « content/browser/media/webrtc/webrtc_internals_browsertest.cc ('k') | content/browser/net_info_browsertest.cc » ('j') | content/public/test/content_browser_test_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/webrtc/webrtc_webcam_browsertest.cc

diff --git a/content/browser/media/webrtc/webrtc_webcam_browsertest.cc b/content/browser/media/webrtc/webrtc_webcam_browsertest.cc

index 32eeb111532d6b0282c3ac64cd801237730c66c5..d1269c972aaac620dd11079df2976f109835ae91 100644

--- a/content/browser/media/webrtc/webrtc_webcam_browsertest.cc

+++ b/content/browser/media/webrtc/webrtc_webcam_browsertest.cc

@@ -78,9 +78,8 @@ IN_PROC_BROWSER_TEST_F(WebRtcWebcamBrowserTest,

NavigateToURL(shell(), url);

std::string result;

- ASSERT_TRUE(ExecuteScriptAndExtractString(shell()->web_contents(),

- "hasVideoInputDeviceOnSystem()",

- &result));

+ ASSERT_TRUE(ExecuteScriptAndExtractString(

+ shell(), "hasVideoInputDeviceOnSystem()", &result));

if (result != "has-video-input-device") {

VLOG(0) << "No video device; skipping test...";

return;

@@ -88,9 +87,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcWebcamBrowserTest,

// GetUserMedia should acquire VGA by default.

ASSERT_TRUE(ExecuteScriptAndExtractString(

- shell()->web_contents(),

- "getUserMediaAndReturnVideoDimensions({video: true})",

- &result));

+ shell(), "getUserMediaAndReturnVideoDimensions({video: true})", &result));

if (result == "640x480" || result == "480x640") {

// Don't care if the device happens to be in landscape or portrait mode