Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Unified Diff: content/browser/frame_host/render_frame_host_manager_browsertest.cc

Issue 2650473002: Don't swap processes for chrome:// subframes. (Closed)
Patch Set: Restore transfer code due to failing WebUI tests. Created 3 years, 11 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/frame_host/render_frame_host_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
index e8b4bc26ee4b02bc3589fd52d4af4f5698b4d591..4036409c32792ddbd70603fec143d4f4628fc067 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -3031,4 +3031,75 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, LastCommittedOrigin) {
}
}
+// Verify that with Site Isolation enabled, chrome:// pages with subframes
+// to other chrome:// URLs all stay in the same process.
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
+ ChromeSchemeSubframesStayInProcessWithParent) {
+ // Enable Site Isolation so subframes with different chrome:// URLs will be
+ // treated as cross-site.
+ IsolateAllSitesForTesting(base::CommandLine::ForCurrentProcess());
+ StartEmbeddedServer();
+
+ GURL chrome_top_url = GURL(std::string(kChromeUIScheme) + "://" +
+ std::string(kChromeUIBlobInternalsHost));
+ GURL chrome_child_url = GURL(std::string(kChromeUIScheme) + "://" +
+ std::string(kChromeUIHistogramHost));
+ GURL regular_web_url(embedded_test_server()->GetURL("/title1.html"));
+
+ NavigationControllerImpl& controller = static_cast<NavigationControllerImpl&>(
+ shell()->web_contents()->GetController());
+ FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
+ ->GetFrameTree()
+ ->root();
+
+ // Navigate the main frame to the top chrome:// URL.
+ NavigateToURL(shell(), chrome_top_url);
+
+ // Inject a frame in the page and navigate it to a chrome:// URL as well.
+ {
+ std::string script = base::StringPrintf(
+ "var frame = document.createElement('iframe');\n"
+ "frame.src = '%s';\n"
+ "document.body.appendChild(frame);\n",
+ chrome_child_url.spec().c_str());
+
+ TestNavigationObserver navigation_observer(shell()->web_contents());
+ EXPECT_TRUE(ExecuteScript(shell(), script));
+ navigation_observer.Wait();
+ EXPECT_EQ(1U, root->child_count());
+
+ // Ensure the subframe navigated to the expected URL and that it is in the
+ // same SiteInstance as the parent frame.
+ NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
+ ASSERT_EQ(1U, entry->root_node()->children.size());
+ EXPECT_EQ(chrome_child_url,
+ entry->root_node()->children[0]->frame_entry->url());
+ EXPECT_EQ(root->current_frame_host()->GetSiteInstance(),
+ root->child_at(0)->current_frame_host()->GetSiteInstance());
+ }
+
+ // Ensure that non-chrome:// pages get a different SiteInstance and process.
+ {
+ std::string script = base::StringPrintf(
+ "var frame = document.createElement('iframe');\n"
+ "frame.src = '%s';\n"
+ "document.body.appendChild(frame);\n",
+ regular_web_url.spec().c_str());
+
+ TestNavigationObserver navigation_observer(shell()->web_contents());
+ EXPECT_TRUE(ExecuteScript(shell(), script));
+ navigation_observer.Wait();
+ EXPECT_EQ(2U, root->child_count());
+
+ // Ensure the subframe navigated to the expected URL and that it is in a
+ // different SiteInstance from the parent frame.
+ NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
+ ASSERT_EQ(2U, entry->root_node()->children.size());
+ EXPECT_EQ(regular_web_url,
+ entry->root_node()->children[1]->frame_entry->url());
+ EXPECT_NE(root->current_frame_host()->GetSiteInstance(),
+ root->child_at(1)->current_frame_host()->GetSiteInstance());
+ }
+}
+
} // namespace content
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698