Commit b4a92bc2 authored by Lucas Furukawa Gadani's avatar Lucas Furukawa Gadani Committed by Commit Bot

Remove usages of WebContents::GetRenderViewHost().

This CL was uploaded by git cl split.

R=kenrb@chromium.org

Bug: 1142671
Change-Id: I0826f093bde1723c93139f7d4b7bb388aae7074e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500663
Auto-Submit: Lucas Gadani <lfg@chromium.org>
Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Commit-Queue: Ken Buchanan <kenrb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821429}
parent c13fdb2e
...@@ -1327,7 +1327,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest, CrossSiteIframe) { ...@@ -1327,7 +1327,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest, CrossSiteIframe) {
SiteInstance* site_instance = child->current_frame_host()->GetSiteInstance(); SiteInstance* site_instance = child->current_frame_host()->GetSiteInstance();
RenderViewHost* rvh = child->current_frame_host()->render_view_host(); RenderViewHost* rvh = child->current_frame_host()->render_view_host();
RenderProcessHost* rph = child->current_frame_host()->GetProcess(); RenderProcessHost* rph = child->current_frame_host()->GetProcess();
EXPECT_NE(shell()->web_contents()->GetRenderViewHost(), rvh); EXPECT_NE(shell()->web_contents()->GetMainFrame()->GetRenderViewHost(), rvh);
EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site_instance); EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site_instance);
EXPECT_NE(shell()->web_contents()->GetMainFrame()->GetProcess(), rph); EXPECT_NE(shell()->web_contents()->GetMainFrame()->GetProcess(), rph);
{ {
...@@ -1373,7 +1373,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest, CrossSiteIframe) { ...@@ -1373,7 +1373,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest, CrossSiteIframe) {
// top level one and the previous one. // top level one and the previous one.
ASSERT_EQ(2U, root->child_count()); ASSERT_EQ(2U, root->child_count());
child = root->child_at(0); child = root->child_at(0);
EXPECT_NE(shell()->web_contents()->GetRenderViewHost(), EXPECT_NE(shell()->web_contents()->GetMainFrame()->GetRenderViewHost(),
child->current_frame_host()->render_view_host()); child->current_frame_host()->render_view_host());
EXPECT_NE(rvh, child->current_frame_host()->render_view_host()); EXPECT_NE(rvh, child->current_frame_host()->render_view_host());
EXPECT_NE(shell()->web_contents()->GetSiteInstance(), EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
...@@ -5832,8 +5832,9 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest, ...@@ -5832,8 +5832,9 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest,
EXPECT_EQ(root->child_at(0), root->frame_tree()->GetFocusedFrame()); EXPECT_EQ(root->child_at(0), root->frame_tree()->GetFocusedFrame());
// Click on the root frame. // Click on the root frame.
SimulateMouseClick(shell()->web_contents()->GetRenderViewHost()->GetWidget(), SimulateMouseClick(
1, 1); shell()->web_contents()->GetMainFrame()->GetRenderViewHost()->GetWidget(),
1, 1);
// Check that the subframe lost focus and fired blur event on its // Check that the subframe lost focus and fired blur event on its
// document's body. // document's body.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment