content/browser/site_per_process_browsertest.cc - Issue 1890453002: [Refactor] Replace static casts to WebContentsImpl with member function.

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 1890453002: [Refactor] Replace static casts to WebContentsImpl with member function. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge Created 4 years, 8 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: content/browser/site_per_process_browsertest.cc

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

index e00123815bc6da00b34ab33fa3ce1dd3fd9fb28e..ccc1803b32baa2ab38d263a5d1a01d9ac3f162c6 100644

--- a/content/browser/site_per_process_browsertest.cc

+++ b/content/browser/site_per_process_browsertest.cc

@@ -630,9 +630,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -646,8 +644,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) {

// There should be only one RenderWidgetHost when there are no

// cross-process iframes.

std::set<RenderWidgetHostView*> views_set =

- static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetRenderWidgetHostViewsInTree();

+ web_contents()->GetRenderWidgetHostViewsInTree();

EXPECT_EQ(1U, views_set.size());

}

@@ -680,8 +677,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) {

// There should be now two RenderWidgetHosts, one for each process

// rendering a frame.

std::set<RenderWidgetHostView*> views_set =

- static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetRenderWidgetHostViewsInTree();

+ web_contents()->GetRenderWidgetHostViewsInTree();

EXPECT_EQ(2U, views_set.size());

}

RenderFrameProxyHost* proxy_to_parent =

@@ -728,8 +724,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) {

EXPECT_NE(rph, child->current_frame_host()->GetProcess());

{

std::set<RenderWidgetHostView*> views_set =

- static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetRenderWidgetHostViewsInTree();

+ web_contents()->GetRenderWidgetHostViewsInTree();

EXPECT_EQ(2U, views_set.size());

}

EXPECT_EQ(proxy_to_parent, child->render_manager()->GetProxyToParent());

@@ -796,9 +791,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

FrameTreeNode* parent_iframe_node = root->child_at(0);

@@ -824,8 +817,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

nested_iframe_node->current_frame_host()->GetRenderWidgetHost());

RenderWidgetHostInputEventRouter* router =

- static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetInputEventRouter();

+ web_contents()->GetInputEventRouter();

RenderWidgetHostViewBase* root_view = static_cast<RenderWidgetHostViewBase*>(

root->current_frame_host()->GetRenderWidgetHost()->GetView());

@@ -877,9 +869,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

FrameTreeNode* child_node = root->child_at(0);

@@ -895,8 +885,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

child_node->current_frame_host()->GetRenderWidgetHost());

RenderWidgetHostInputEventRouter* router =

- static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetInputEventRouter();

+ web_contents()->GetInputEventRouter();

RenderWidgetHostViewBase* root_view = static_cast<RenderWidgetHostViewBase*>(

root->current_frame_host()->GetRenderWidgetHost()->GetView());

@@ -939,9 +928,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

FrameTreeNode* child_node = root->child_at(0);

@@ -972,9 +959,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CleanupCrossSiteIframe) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -1031,9 +1016,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, RestrictFrameDetach) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -1095,9 +1078,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NavigateRemoteFrame) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -1164,9 +1145,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -1272,9 +1251,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

ASSERT_EQ(2U, root->child_count());

@@ -1323,9 +1300,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

ASSERT_EQ(2U, root->child_count());

@@ -1410,9 +1385,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NavigateRemoteAfterError) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Load same-site page into iframe.

{

@@ -1466,9 +1439,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, ProcessTransferAfterError) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

FrameTreeNode* child = root->child_at(0);

GURL url_a = child->current_url();

@@ -1570,9 +1541,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

EXPECT_EQ(

@@ -1635,9 +1604,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(

" Site A ------------ proxies for B\n"

@@ -1712,9 +1679,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

SiteInstance* site_instance_a = root->current_frame_host()->GetSiteInstance();

// Open a popup and navigate it cross-process to b.com.

@@ -1800,9 +1765,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(2U, root->child_count());

GURL site_b_url(

@@ -1874,9 +1837,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrashSubframe) {

NavigateToURL(shell(), main_url);

// Check the subframe process.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(

" Site A ------------ proxies for B\n"

" +--Site B ------- proxies for A\n"

@@ -1937,9 +1898,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CreateProxiesForNewFrames) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

// Make sure the frame starts out at the correct cross-site URL.

@@ -2182,9 +2141,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_TRUE(root->child_at(1) != NULL);

EXPECT_EQ(2U, root->child_at(1)->child_count());

@@ -2330,9 +2287,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1u, root->child_count());

EXPECT_EQ(

@@ -2398,9 +2353,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1u, root->child_count());

EXPECT_EQ(

@@ -2487,9 +2440,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, OriginReplication) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(

" Site A ------------ proxies for B C\n"

@@ -2578,9 +2529,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, SandboxFlagsReplication) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -2678,9 +2627,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DynamicSandboxFlags) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

ASSERT_EQ(2U, root->child_count());

@@ -2802,9 +2749,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

ASSERT_EQ(2U, root->child_count());

@@ -2872,9 +2817,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

ASSERT_EQ(1U, root->child_count());

@@ -2953,9 +2896,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

EXPECT_EQ(

@@ -3034,9 +2975,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, WindowNameReplication) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -3067,9 +3006,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DynamicWindowName) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

// Load cross-site page into iframe.

@@ -3126,9 +3063,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, OriginUpdatesReachProxies) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

EXPECT_EQ(

@@ -3179,9 +3114,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteDidStopLoading) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(shell()->web_contents())->

- GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -3215,9 +3148,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

// Make sure the first frame is out of process.

@@ -3251,9 +3182,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

FrameTreeNode* node2 = root->child_at(0);

FrameTreeNode* node3 = root->child_at(1);

@@ -3298,9 +3227,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, LoadEventForwarding) {

}

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Load another cross-site page into the iframe and check that the load event

// is fired.

@@ -3323,9 +3250,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, SubframePostMessage) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(2U, root->child_count());

@@ -3371,9 +3296,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(2U, root->child_count());

@@ -3482,9 +3405,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, IndexedFrameAccess) {

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(3U, root->child_count());

FrameTreeNode* child0 = root->child_at(0);

FrameTreeNode* child1 = root->child_at(1);

@@ -3554,9 +3475,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, RFPHDestruction) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -3615,9 +3534,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, OpenPopupWithRemoteParent) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Navigate first child cross-site.

GURL frame_url(embedded_test_server()->GetURL("b.com", "/title1.html"));

@@ -3719,9 +3636,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Navigate first child cross-site.

GURL frame_url(embedded_test_server()->GetURL("b.com", "/title1.html"));

@@ -3772,9 +3687,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Open a same-site popup from the main frame.

GURL a_com_url(embedded_test_server()->GetURL("a.com", "/title3.html"));

@@ -3832,9 +3745,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, UpdateSubframeOpener) {

"foo.com", "/frame_tree/page_with_two_frames.html");

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(2U, root->child_count());

// From the top frame, open a popup and navigate it to a cross-site page with

@@ -3907,9 +3818,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

GURL main_url = embedded_test_server()->GetURL("a.com", "/post_message.html");

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Open a popup with a cross-site page that has a subframe.

GURL popup_url(embedded_test_server()->GetURL(

@@ -3954,9 +3863,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NavigateSubframeWithOpener) {

"foo.com", "/frame_tree/page_with_two_frames.html"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(

" Site A ------------ proxies for B\n"

" |--Site B ------- proxies for A\n"

@@ -4021,9 +3928,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

embedded_test_server()->GetURL("foo.com", "/post_message.html"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Open a popup with a cross-site page that has two subframes.

GURL popup_url(embedded_test_server()->GetURL(

@@ -4100,9 +4005,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

GURL a_url(embedded_test_server()->GetURL("a.com", "/title1.html"));

NavigateToURL(shell(), a_url);

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

RenderFrameHostImpl* rfh = root->current_frame_host();

RenderViewHostImpl* rvh = rfh->render_view_host();

int rvh_routing_id = rvh->GetRoutingID();

@@ -4194,9 +4097,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

embedded_test_server()->GetURL("a.com", "/page_with_input_field.html"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(

" Site A ------------ proxies for B\n"

@@ -4256,9 +4157,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DocumentActiveElement) {

"a.com", "/cross_site_iframe_factory.html?a(b(c))"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(

" Site A ------------ proxies for B C\n"

@@ -4330,9 +4229,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, SubframeWindowFocus) {

"a.com", "/cross_site_iframe_factory.html?a(b,c)"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_EQ(

" Site A ------------ proxies for B C\n"

@@ -4469,9 +4366,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

"/frame_tree/page_with_positioned_frame.html"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

FrameTreeNode* child_node = root->child_at(0);

EXPECT_NE(shell()->web_contents()->GetSiteInstance(),

@@ -4490,9 +4385,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

root->child_at(0)->current_frame_host()->GetRenderWidgetHost();

RenderWidgetHostViewBase* root_view = static_cast<RenderWidgetHostViewBase*>(

root->current_frame_host()->GetRenderWidgetHost()->GetView());

- static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetInputEventRouter()

- ->RouteMouseEvent(root_view, &mouse_event);

+ web_contents()->GetInputEventRouter()->RouteMouseEvent(root_view,

+ &mouse_event);

// CursorMessageFilter::Wait() implicitly tests whether we receive a

// ViewHostMsg_SetCursor message from the renderer process, because it does

@@ -4535,9 +4429,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

"/frame_tree/page_with_positioned_nested_frames.html"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- WebContentsImpl* web_contents =

- static_cast<WebContentsImpl*>(shell()->web_contents());

- FrameTreeNode* root = web_contents->GetFrameTree()->root();

+ WebContentsImpl* contents = web_contents();

Charlie Reis 2016/04/15 05:25:56 nit: This doesn't seem necessary. Just call web_c

+ FrameTreeNode* root = contents->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

GURL frame_url(

@@ -4555,7 +4448,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

// Simulate touch event to sub-frame.

gfx::Point child_center(150, 150);

auto rwhv = static_cast<RenderWidgetHostViewAura*>(

- web_contents->GetRenderWidgetHostView());

+ contents->GetRenderWidgetHostView());

ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, child_center, 0, 0,

ui::EventTimeForNow(), 30.f, 30.f, 0.f, 0.f);

rwhv->OnTouchEvent(&touch_event);

@@ -4591,9 +4484,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

"/frame_tree/page_with_positioned_nested_frames.html"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- WebContentsImpl* web_contents =

- static_cast<WebContentsImpl*>(shell()->web_contents());

- FrameTreeNode* root = web_contents->GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

GURL frame_url(

@@ -4726,9 +4617,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

"/frame_tree/page_with_positioned_nested_frames.html"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- WebContentsImpl* web_contents =

- static_cast<WebContentsImpl*>(shell()->web_contents());

- FrameTreeNode* root = web_contents->GetFrameTree()->root();

+ WebContentsImpl* contents = web_contents();

Charlie Reis 2016/04/15 05:25:56 Same.

+ FrameTreeNode* root = contents->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

GURL frame_url(

@@ -4747,10 +4637,9 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

// All touches & gestures are sent to the main frame's view, and should be

// routed appropriately from there.

auto rwhv_parent = static_cast<RenderWidgetHostViewBase*>(

- web_contents->GetRenderWidgetHostView());

+ contents->GetRenderWidgetHostView());

- RenderWidgetHostInputEventRouter* router =

- web_contents->GetInputEventRouter();

+ RenderWidgetHostInputEventRouter* router = contents->GetInputEventRouter();

EXPECT_TRUE(router->gesture_target_queue_.empty());

EXPECT_EQ(nullptr, router->gesture_target_);

@@ -4827,8 +4716,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

WebContents* contents = shell()->web_contents();

- FrameTreeNode* root =

- static_cast<WebContentsImpl*>(contents)->GetFrameTree()->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Assign a name to each frame. This will be sent along in test messages

// from focus events.

@@ -5101,16 +4989,14 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_PopupMenuTest) {

embedded_test_server()->GetURL("/cross_site_iframe_factory.html?a(a)"));

NavigateToURL(shell(), main_url);

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

#if !defined(OS_MACOSX)

// Unused variable on Mac.

RenderWidgetHostViewBase* rwhv_root = static_cast<RenderWidgetHostViewBase*>(

root->current_frame_host()->GetRenderWidgetHost()->GetView());

#endif

- static_cast<WebContentsImpl*>(shell()->web_contents())->SendScreenRects();

+ web_contents()->SendScreenRects();

content::TestNavigationObserver navigation_observer(shell()->web_contents());

FrameTreeNode* child_node = root->child_at(0);

@@ -5172,16 +5058,14 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_NestedPopupMenuTest) {

"/cross_site_iframe_factory.html?a(b(c))"));

NavigateToURL(shell(), main_url);

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

#if !defined(OS_MACOSX)

// Undefined variable on Mac.

RenderWidgetHostViewBase* rwhv_root = static_cast<RenderWidgetHostViewBase*>(

root->current_frame_host()->GetRenderWidgetHost()->GetView());

#endif

- static_cast<WebContentsImpl*>(shell()->web_contents())->SendScreenRects();

+ web_contents()->SendScreenRects();

// For clarity, we are labeling the frame tree nodes as:

// - root_node

@@ -5458,10 +5342,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// Capture the FrameTreeNode this test will be navigating.

- FrameTreeNode* node = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root()

- ->child_at(0);

+ FrameTreeNode* node = web_contents()->GetFrameTree()->root()->child_at(0);

EXPECT_TRUE(node);

EXPECT_NE(node->current_frame_host()->GetSiteInstance(),

node->parent()->current_frame_host()->GetSiteInstance());

@@ -5535,12 +5416,11 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, ParentDetachRemoteChild) {

"a.com", "/cross_site_iframe_factory.html?a(b,b)"));

NavigateToURL(shell(), main_url);

- WebContentsImpl* web_contents =

- static_cast<WebContentsImpl*>(shell()->web_contents());

- EXPECT_EQ(2U, web_contents->GetFrameTree()->root()->child_count());

+ WebContentsImpl* contents = web_contents();

Charlie Reis 2016/04/15 05:25:56 Same.

+ EXPECT_EQ(2U, contents->GetFrameTree()->root()->child_count());

// Capture the FrameTreeNode this test will be navigating.

- FrameTreeNode* node = web_contents->GetFrameTree()->root()->child_at(0);

+ FrameTreeNode* node = contents->GetFrameTree()->root()->child_at(0);

EXPECT_TRUE(node);

EXPECT_NE(node->current_frame_host()->GetSiteInstance(),

node->parent()->current_frame_host()->GetSiteInstance());

@@ -5560,10 +5440,10 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, ParentDetachRemoteChild) {

// Have the parent frame remove the child frame from its DOM. This should

// result in the child RenderFrame being deleted in the remote process.

- EXPECT_TRUE(ExecuteScript(web_contents,

+ EXPECT_TRUE(ExecuteScript(contents,

"document.body.removeChild("

"document.querySelectorAll('iframe')[0])"));

- EXPECT_EQ(1U, web_contents->GetFrameTree()->root()->child_count());

+ EXPECT_EQ(1U, contents->GetFrameTree()->root()->child_count());

{

FrameMsg_NewFrame_Params params;

@@ -5584,9 +5464,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, ParentDetachRemoteChild) {

// RenderFrame will be properly created and there will be no crash.

// Therefore, navigate the remaining subframe to completely different site,

// which will cause the original process to exit cleanly.

- NavigateFrameToURL(

- web_contents->GetFrameTree()->root()->child_at(0),

- embedded_test_server()->GetURL("d.com", "/title3.html"));

+ NavigateFrameToURL(contents->GetFrameTree()->root()->child_at(0),

+ embedded_test_server()->GetURL("d.com", "/title3.html"));

watcher.Wait();

EXPECT_TRUE(watcher.did_exit_normally());

}

@@ -5600,9 +5479,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, VisibilityChanged) {

GURL cross_site_url =

embedded_test_server()->GetURL("oopif.com", "/title1.html");

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

TestNavigationObserver observer(shell()->web_contents());

@@ -5640,9 +5517,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, SandboxFlagsInheritance) {

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Set sandbox flags for child frame.

EXPECT_TRUE(ExecuteScript(

@@ -5695,9 +5570,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

NavigateToURL(shell(), main_url);

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Set sandbox flags for child frame.

EXPECT_TRUE(ExecuteScript(

@@ -5747,9 +5620,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Set sandbox flags for child frame.

EXPECT_TRUE(ExecuteScript(root->current_frame_host(),

@@ -5818,9 +5689,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), main_url));

// It is safe to obtain the root frame tree node here, as it doesn't change.

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Set sandbox flags for child frame, specifying that popups opened from it

// should not be sandboxed.

@@ -5895,9 +5764,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest,

// When the subframe navigates, the WebContents should still be marked

// as having displayed insecure content.

GURL navigate_url(https_server.GetURL("/title1.html"));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

NavigateFrameToURL(root->child_at(0), navigate_url);

EXPECT_TRUE(shell()->web_contents()->DisplayedInsecureContent());

@@ -5923,9 +5790,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest,

EXPECT_TRUE(NavigateToURL(shell(), iframe_url_with_strict_blocking));

EXPECT_FALSE(shell()->web_contents()->DisplayedInsecureContent());

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

EXPECT_TRUE(root->current_replication_state()

.should_enforce_strict_mixed_content_checking);

EXPECT_TRUE(root->child_at(0)

@@ -5964,9 +5829,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest,

GURL iframe_url(

https_server.GetURL("/mixed-content/basic-active-in-iframe.html"));

EXPECT_TRUE(NavigateToURL(shell(), iframe_url));

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

ASSERT_EQ(1U, root->child_count());

FrameTreeNode* mixed_child = root->child_at(0)->child_at(0);

ASSERT_TRUE(mixed_child);

@@ -5982,9 +5845,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframeDisplayNone) {

"a.com", "/cross_site_iframe_factory.html?a(b)"));

NavigateToURL(shell(), main_url);

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

RenderWidgetHost* root_render_widget_host =

root->current_frame_host()->GetRenderWidgetHost();

@@ -6014,9 +5875,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

"a.com", "/cross_site_iframe_factory.html?a(a)"));

NavigateToURL(shell(), main_url);

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

// Add a load event handler for the iframe element.

EXPECT_TRUE(ExecuteScript(shell()->web_contents(),

@@ -6084,9 +5943,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, ScreenCoordinates) {

"a.com", "/cross_site_iframe_factory.html?a(b)"));

NavigateToURL(shell(), main_url);

- FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())

- ->GetFrameTree()

- ->root();

+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();

FrameTreeNode* child = root->child_at(0);

const char* properties[] = {"screenX", "screenY", "outerWidth",

@@ -6170,8 +6027,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,

"a.com", "/cross_site_iframe_factory.html?a(b)"));

EXPECT_TRUE(NavigateToURL(shell(), main_url));

- WebContentsImpl* contents =

- static_cast<WebContentsImpl*>(shell()->web_contents());

+ WebContentsImpl* contents = web_contents();

Charlie Reis 2016/04/15 05:25:56 Same.

FrameTreeNode* root = contents->GetFrameTree()->root();

EXPECT_EQ(1U, root->child_count());

« no previous file with comments | « no previous file | no next file » | no next file with comments »