content/browser/security_exploit_browsertest.cc - Issue 2527133002: Remove some WebContents::GetRenderViewHost() calls.

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/security_exploit_browsertest.cc

Issue 2527133002: Remove some WebContents::GetRenderViewHost() calls. (Closed)

Patch Set: More reverts for the same reason as patch set 3, fixes merge conflict Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/security_exploit_browsertest.cc

diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc

index 53622ac0df42fa408ffd7f86247874455f5a93ce..69e69444f3f905ffb74c3b47841311c70cceb47e 100644

--- a/content/browser/security_exploit_browsertest.cc

+++ b/content/browser/security_exploit_browsertest.cc

@@ -79,8 +79,8 @@ RenderViewHostImpl* PrepareToDuplicateHosts(Shell* shell,

Shell* shell2 = shell2_observer.GetShell();

// The new window must be in the same process, but have a new routing id.

- EXPECT_EQ(shell->web_contents()->GetRenderViewHost()->GetProcess()->GetID(),

- shell2->web_contents()->GetRenderViewHost()->GetProcess()->GetID());

+ EXPECT_EQ(shell->web_contents()->GetMainFrame()->GetProcess()->GetID(),

+ shell2->web_contents()->GetMainFrame()->GetProcess()->GetID());

*target_routing_id =

shell2->web_contents()->GetRenderViewHost()->GetRoutingID();

EXPECT_NE(*target_routing_id,