Chromium Code Reviews| 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 0773964b62667660a943ad2bed977e54c2bd74ee..bea4de34b046cf63ec1e74e9b92b6f15a2a083c3 100644 |
| --- a/content/browser/site_per_process_browsertest.cc |
| +++ b/content/browser/site_per_process_browsertest.cc |
| @@ -285,13 +285,6 @@ std::string SitePerProcessBrowserTest::DepictFrameTree(FrameTreeNode* node) { |
| return visualizer_.DepictFrameTree(node); |
| } |
| -void SitePerProcessBrowserTest::StartFrameAtDataURL() { |
| - std::string data_url_script = |
| - "var iframes = document.getElementById('test');iframes.src=" |
| - "'data:text/html,dataurl';"; |
| - ASSERT_TRUE(ExecuteScript(shell()->web_contents(), data_url_script)); |
| -} |
| - |
| void SitePerProcessBrowserTest::SetUpCommandLine( |
| base::CommandLine* command_line) { |
| IsolateAllSitesForTesting(command_line); |
| @@ -306,7 +299,8 @@ void SitePerProcessBrowserTest::SetUpOnMainThread() { |
| // Ensure that navigating subframes in --site-per-process mode works and the |
| // correct documents are committed. |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) { |
| - GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(a,a(a,a(a)))")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -318,7 +312,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) { |
| // Load same-site page into iframe. |
| FrameTreeNode* child = root->child_at(0); |
| - GURL http_url(embedded_test_server()->GetURL("/title1.html")); |
| + GURL http_url(embedded_test_server()->GetURL("a.com", "/title1.html")); |
| NavigateFrameToURL(child, http_url); |
| EXPECT_EQ(http_url, observer.last_navigation_url()); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| @@ -338,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) { |
| " |--Site A\n" |
| " +--Site A\n" |
| " +--Site A\n" |
| - "Where A = http://127.0.0.1/", |
| + "Where A = http://a.com/", |
| DepictFrameTree(root)); |
| // Load cross-site page into iframe. |
| @@ -382,7 +376,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) { |
| " |--Site A -- proxies for B\n" |
| " +--Site A -- proxies for B\n" |
| " +--Site A -- proxies for B\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " B = http://foo.com/", |
| DepictFrameTree(root)); |
| @@ -426,7 +420,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) { |
| " |--Site A -- proxies for C\n" |
| " +--Site A -- proxies for C\n" |
| " +--Site A -- proxies for C\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " C = http://bar.com/", |
| DepictFrameTree(root)); |
| } |
| @@ -441,8 +435,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) { |
| #endif |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| MAYBE_CompositorFrameSwapped) { |
| - GURL main_url( |
| - embedded_test_server()->GetURL("/frame_tree/page_with_one_frame.html")); |
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(baz)")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -452,7 +446,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| ASSERT_EQ(1U, root->child_count()); |
| FrameTreeNode* child_node = root->child_at(0); |
| - GURL site_url(embedded_test_server()->GetURL("baz.com", "/title1.html")); |
| + GURL site_url(embedded_test_server()->GetURL( |
| + "baz.com", "/cross_site_iframe_factory.html?baz()")); |
| EXPECT_EQ(site_url, child_node->current_url()); |
| EXPECT_NE(shell()->web_contents()->GetSiteInstance(), |
| child_node->current_frame_host()->GetSiteInstance()); |
| @@ -473,7 +468,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| // Ensure that OOPIFs are deleted after navigating to a new main frame. |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CleanupCrossSiteIframe) { |
| - GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(a,a(a,a(a)))")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -497,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CleanupCrossSiteIframe) { |
| " Site A ------------ proxies for B\n" |
| " |--Site B ------- proxies for A\n" |
| " +--Site B ------- proxies for A\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " B = http://foo.com/", |
| DepictFrameTree(root)); |
| @@ -521,7 +517,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CleanupCrossSiteIframe) { |
| // Load a new same-site page in the top-level frame and ensure the other |
| // subframe goes away. |
| - GURL new_url(embedded_test_server()->GetURL("/title1.html")); |
| + GURL new_url(embedded_test_server()->GetURL("a.com", "/title1.html")); |
| NavigateToURL(shell(), new_url); |
| ASSERT_EQ(0U, root->child_count()); |
| @@ -531,7 +527,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CleanupCrossSiteIframe) { |
| // Ensure that root frames cannot be detached. |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, RestrictFrameDetach) { |
| - GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(a,a(a,a(a)))")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -566,7 +563,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, RestrictFrameDetach) { |
| " Site A ------------ proxies for B C\n" |
| " |--Site B ------- proxies for A C\n" |
| " +--Site C ------- proxies for A B\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " B = http://foo.com/\n" |
| " C = http://bar.com/", |
| DepictFrameTree(root)); |
| @@ -587,15 +584,15 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, RestrictFrameDetach) { |
| " Site A ------------ proxies for B C\n" |
| " |--Site B ------- proxies for A C\n" |
| " +--Site C ------- proxies for A B\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " B = http://foo.com/ (no process)\n" |
| " C = http://bar.com/", |
| DepictFrameTree(root)); |
| } |
| -IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| - NavigateRemoteFrame) { |
| - GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| +IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NavigateRemoteFrame) { |
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(a,a(a,a(a)))")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -607,7 +604,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| // Load same-site page into iframe. |
| FrameTreeNode* child = root->child_at(0); |
| - GURL http_url(embedded_test_server()->GetURL("/title1.html")); |
| + GURL http_url(embedded_test_server()->GetURL("a.com", "/title1.html")); |
| NavigateFrameToURL(child, http_url); |
| EXPECT_EQ(http_url, observer.last_navigation_url()); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| @@ -619,25 +616,38 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| EXPECT_EQ(url, observer.last_navigation_url()); |
| // Ensure that we have created a new process for the subframe. |
| - ASSERT_EQ(2U, root->child_count()); |
| + EXPECT_EQ( |
| + " Site A ------------ proxies for B\n" |
| + " |--Site B ------- proxies for A\n" |
| + " +--Site A ------- proxies for B\n" |
| + " |--Site A -- proxies for B\n" |
| + " +--Site A -- proxies for B\n" |
| + " +--Site A -- proxies for B\n" |
| + "Where A = http://a.com/\n" |
| + " B = http://foo.com/", |
| + DepictFrameTree(root)); |
| SiteInstance* site_instance = child->current_frame_host()->GetSiteInstance(); |
| EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site_instance); |
| // Emulate the main frame changing the src of the iframe such that it |
| // navigates cross-site. |
| url = embedded_test_server()->GetURL("bar.com", "/title3.html"); |
| - NavigateIframeToURL(shell()->web_contents(), "test", url); |
| + NavigateIframeToURL(shell()->web_contents(), "child-0", url); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| EXPECT_EQ(url, observer.last_navigation_url()); |
| // Check again that a new process is created and is different from the |
| // top level one and the previous one. |
| - ASSERT_EQ(2U, root->child_count()); |
| - child = root->child_at(0); |
| - EXPECT_NE(shell()->web_contents()->GetSiteInstance(), |
| - child->current_frame_host()->GetSiteInstance()); |
| - EXPECT_NE(site_instance, |
| - child->current_frame_host()->GetSiteInstance()); |
| + EXPECT_EQ( |
| + " Site A ------------ proxies for C\n" |
| + " |--Site C ------- proxies for A\n" |
| + " +--Site A ------- proxies for C\n" |
| + " |--Site A -- proxies for C\n" |
| + " +--Site A -- proxies for C\n" |
| + " +--Site A -- proxies for C\n" |
| + "Where A = http://a.com/\n" |
| + " C = http://bar.com/", |
| + DepictFrameTree(root)); |
| // Navigate back to the parent's origin and ensure we return to the |
| // parent's process. |
| @@ -648,18 +658,10 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| child->current_frame_host()->GetSiteInstance()); |
| } |
| -#if defined(OS_WIN) |
| -// http://crbug.com/465722 |
| -#define MAYBE_NavigateRemoteFrameToBlankAndDataURLs \ |
| - DISABLED_NavigateRemoteFrameToBlankAndDataURLs |
| -#else |
| -#define MAYBE_NavigateRemoteFrameToBlankAndDataURLs \ |
| - NavigateRemoteFrameToBlankAndDataURLs |
| -#endif |
| - |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| - MAYBE_NavigateRemoteFrameToBlankAndDataURLs) { |
| - GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| + NavigateRemoteFrameToBlankAndDataURLs) { |
|
Charlie Reis
2015/08/27 21:14:48
Sure, we can give re-enabling this a try to see if
|
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(a,a(a))")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -671,52 +673,79 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| // Load same-site page into iframe. |
| FrameTreeNode* child = root->child_at(0); |
| - GURL http_url(embedded_test_server()->GetURL("/title1.html")); |
| + GURL http_url(embedded_test_server()->GetURL("a.com", "/title1.html")); |
| NavigateFrameToURL(child, http_url); |
| EXPECT_EQ(http_url, observer.last_navigation_url()); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| + EXPECT_EQ( |
| + " Site A\n" |
| + " |--Site A\n" |
| + " +--Site A\n" |
| + " +--Site A\n" |
| + "Where A = http://a.com/", |
| + DepictFrameTree(root)); |
| // Load cross-site page into iframe. |
| GURL url = embedded_test_server()->GetURL("foo.com", "/title2.html"); |
| NavigateFrameToURL(root->child_at(0), url); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| EXPECT_EQ(url, observer.last_navigation_url()); |
| - ASSERT_EQ(2U, root->child_count()); |
| - EXPECT_NE(shell()->web_contents()->GetSiteInstance(), |
| - root->child_at(0)->current_frame_host()->GetSiteInstance()); |
| + EXPECT_EQ( |
| + " Site A ------------ proxies for B\n" |
| + " |--Site B ------- proxies for A\n" |
| + " +--Site A ------- proxies for B\n" |
| + " +--Site A -- proxies for B\n" |
| + "Where A = http://a.com/\n" |
| + " B = http://foo.com/", |
| + DepictFrameTree(root)); |
| // Navigate iframe to a data URL. The navigation happens from a script in the |
| // parent frame, so the data URL should be committed in the same SiteInstance |
| // as the parent frame. |
| GURL data_url("data:text/html,dataurl"); |
| - NavigateIframeToURL(shell()->web_contents(), "test", data_url); |
| + NavigateIframeToURL(shell()->web_contents(), "child-0", data_url); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| EXPECT_EQ(data_url, observer.last_navigation_url()); |
| // Ensure that we have navigated using the top level process. |
| - EXPECT_EQ(shell()->web_contents()->GetSiteInstance(), |
| - root->child_at(0)->current_frame_host()->GetSiteInstance()); |
| + EXPECT_EQ( |
| + " Site A\n" |
| + " |--Site A\n" |
| + " +--Site A\n" |
| + " +--Site A\n" |
| + "Where A = http://a.com/", |
| + DepictFrameTree(root)); |
| // Load cross-site page into iframe. |
| url = embedded_test_server()->GetURL("bar.com", "/title2.html"); |
| NavigateFrameToURL(root->child_at(0), url); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| EXPECT_EQ(url, observer.last_navigation_url()); |
| - ASSERT_EQ(2U, root->child_count()); |
| - EXPECT_NE(shell()->web_contents()->GetSiteInstance(), |
| - root->child_at(0)->current_frame_host()->GetSiteInstance()); |
| + EXPECT_EQ( |
| + " Site A ------------ proxies for C\n" |
| + " |--Site C ------- proxies for A\n" |
| + " +--Site A ------- proxies for C\n" |
| + " +--Site A -- proxies for C\n" |
| + "Where A = http://a.com/\n" |
| + " C = http://bar.com/", |
| + DepictFrameTree(root)); |
| // Navigate iframe to about:blank. The navigation happens from a script in the |
| // parent frame, so it should be committed in the same SiteInstance as the |
| // parent frame. |
| GURL about_blank_url("about:blank"); |
| - NavigateIframeToURL(shell()->web_contents(), "test", about_blank_url); |
| + NavigateIframeToURL(shell()->web_contents(), "child-0", about_blank_url); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| EXPECT_EQ(about_blank_url, observer.last_navigation_url()); |
| // Ensure that we have navigated using the top level process. |
| - EXPECT_EQ(shell()->web_contents()->GetSiteInstance(), |
| - root->child_at(0)->current_frame_host()->GetSiteInstance()); |
| + EXPECT_EQ( |
| + " Site A\n" |
| + " |--Site A\n" |
| + " +--Site A\n" |
| + " +--Site A\n" |
| + "Where A = http://a.com/", |
| + DepictFrameTree(root)); |
| } |
| // This test checks that killing a renderer process of a remote frame |
| @@ -740,7 +769,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| NavigateRemoteFrameToKilledProcess) { |
| GURL main_url(embedded_test_server()->GetURL( |
| - "/frame_tree/page_with_two_frames.html")); |
| + "foo.com", "/cross_site_iframe_factory.html?foo.com(bar.com, foo.com)")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -752,7 +781,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| ASSERT_EQ(2U, root->child_count()); |
| // Make sure node2 points to the correct cross-site page. |
| - GURL site_b_url = embedded_test_server()->GetURL("bar.com", "/title1.html"); |
| + GURL site_b_url = embedded_test_server()->GetURL( |
| + "bar.com", "/cross_site_iframe_factory.html?bar.com()"); |
| FrameTreeNode* node2 = root->child_at(0); |
| EXPECT_EQ(site_b_url, node2->current_url()); |
| @@ -790,7 +820,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| NavigateRemoteFrameToKilledProcessWithSubtree) { |
| GURL main_url(embedded_test_server()->GetURL( |
| - "a.com", "/frame_tree/page_with_two_frames_nested.html")); |
| + "a.com", "/cross_site_iframe_factory.html?a(bar(baz), a)")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -801,9 +831,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| ASSERT_EQ(2U, root->child_count()); |
| - GURL site_b_url( |
| - embedded_test_server()->GetURL( |
| - "bar.com", "/frame_tree/page_with_one_frame.html")); |
| + GURL site_b_url(embedded_test_server()->GetURL( |
| + "bar.com", "/cross_site_iframe_factory.html?bar(baz())")); |
| // We can't use a TestNavigationObserver to verify the URL here, |
| // since the frame has children that may have clobbered it in the observer. |
| EXPECT_EQ(site_b_url, root->child_at(0)->current_url()); |
| @@ -819,7 +848,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| // Make sure node4 points to the correct cross-site page. |
| FrameTreeNode* node4 = root->child_at(0)->child_at(0); |
| - GURL site_c_url(embedded_test_server()->GetURL("baz.com", "/title1.html")); |
| + GURL site_c_url(embedded_test_server()->GetURL( |
| + "baz.com", "/cross_site_iframe_factory.html?baz()")); |
| EXPECT_EQ(site_c_url, node4->current_url()); |
| // |site_instance_c| is expected to go away once we kill |child_process_b| |
| @@ -1193,26 +1223,21 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| // Crash a subframe and ensures its children are cleared from the FrameTree. |
| // See http://crbug.com/338508. |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrashSubframe) { |
| - GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(b)")); |
| NavigateToURL(shell(), main_url); |
| - StartFrameAtDataURL(); |
|
Charlie Reis
2015/08/27 21:14:48
Nice. I'm not sure if the motivation for this met
|
| - |
| - // Load cross-site page into iframe. |
| - EXPECT_TRUE(NavigateIframeToURL( |
| - shell()->web_contents(), "test", |
| - embedded_test_server()->GetURL("/cross-site/foo.com/title2.html"))); |
| - |
| // Check the subframe process. |
| FrameTreeNode* root = |
| static_cast<WebContentsImpl*>(shell()->web_contents())-> |
| GetFrameTree()->root(); |
| - ASSERT_EQ(2U, root->child_count()); |
| + EXPECT_EQ( |
| + " Site A ------------ proxies for B\n" |
| + " +--Site B ------- proxies for A\n" |
| + "Where A = http://a.com/\n" |
| + " B = http://b.com/", |
| + DepictFrameTree(root)); |
| FrameTreeNode* child = root->child_at(0); |
| - EXPECT_EQ(main_url, root->current_url()); |
| - EXPECT_EQ("foo.com", child->current_url().host()); |
| - EXPECT_EQ("/title2.html", child->current_url().path()); |
| - |
| EXPECT_TRUE( |
| child->current_frame_host()->render_view_host()->IsRenderViewLive()); |
| EXPECT_TRUE(child->current_frame_host()->IsRenderFrameLive()); |
| @@ -1229,7 +1254,13 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrashSubframe) { |
| } |
| // Ensure that the child frame still exists but has been cleared. |
| - EXPECT_EQ(2U, root->child_count()); |
| + EXPECT_EQ( |
| + " Site A ------------ proxies for B\n" |
| + " +--Site B ------- proxies for A\n" |
| + "Where A = http://a.com/\n" |
| + " B = http://b.com/ (no process)", |
| + DepictFrameTree(root)); |
| + EXPECT_EQ(1U, root->child_count()); |
| EXPECT_EQ(main_url, root->current_url()); |
| EXPECT_EQ(GURL(), child->current_url()); |
| @@ -1510,7 +1541,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| // created in the FrameTree skipping the subtree of the navigating frame. |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| ProxyCreationSkipsSubtree) { |
| - GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| + GURL main_url(embedded_test_server()->GetURL( |
| + "a.com", "/cross_site_iframe_factory.html?a(a,a(a,a(a)))")); |
| NavigateToURL(shell(), main_url); |
| // It is safe to obtain the root frame tree node here, as it doesn't change. |
| @@ -1524,7 +1556,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| { |
| // Load same-site page into iframe. |
| TestNavigationObserver observer(shell()->web_contents()); |
| - GURL http_url(embedded_test_server()->GetURL("/title1.html")); |
| + GURL http_url(embedded_test_server()->GetURL("a.com", "/title1.html")); |
| NavigateFrameToURL(root->child_at(0), http_url); |
| EXPECT_EQ(http_url, observer.last_navigation_url()); |
| EXPECT_TRUE(observer.last_navigation_succeeded()); |
| @@ -1535,7 +1567,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| " |--Site A\n" |
| " +--Site A\n" |
| " +--Site A\n" |
| - "Where A = http://127.0.0.1/", |
| + "Where A = http://a.com/", |
| DepictFrameTree(root)); |
| } |
| @@ -1579,7 +1611,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| " |--Site A\n" |
| " +--Site A\n" |
| " +--Site A\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " B = http://foo.com/", |
| cross_site_rfh_type.c_str()); |
| EXPECT_EQ(tree, DepictFrameTree(root)); |
| @@ -1595,7 +1627,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| " Site A ------------ proxies for B\n" |
| " |--Site A ------- proxies for B\n" |
| " +--Site B ------- proxies for A\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " B = http://foo.com/", |
| DepictFrameTree(root)); |
| } |
| @@ -1631,7 +1663,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| " Site A ------------ proxies for B C\n" |
| " |--Site A ------- proxies for B C\n" |
| " +--Site B (C %s) -- proxies for A\n" |
| - "Where A = http://127.0.0.1/\n" |
| + "Where A = http://a.com/\n" |
| " B = http://foo.com/\n" |
| " C = http://bar.com/", |
| cross_site_rfh_type.c_str()); |