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

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

Issue 618853004: Revert of Don't ensure, in single-process mode, that WebUI render views are the only ones in the process, as … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index f056fa9d05bbc5b46d555ebabc6c76ccf8fa7c57..23b49c8cde575de2dec6b95bc533236b58a864e0 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -1036,37 +1036,6 @@
manager2->DidNavigateFrame(host2);
}
-// Test that WebUI can be navigated to in single-process mode.
-TEST_F(RenderFrameHostManagerTest,
- CanNavigateBetweenNormalPagesAndWebUIInSingleProcess) {
- const GURL kNormalUrl1("http://chromium.org");
- const GURL kNormalUrl2("http://example.com");
- const GURL kWebUIUrl("chrome://foo");
-
- // We both set flag on RenderProcesHost and append the switch due to the fact
- // that some code checks the switch directly instead of relying
- // on RenderProcessHost
- RenderProcessHost::SetRunRendererInProcess(true);
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSingleProcess);
- set_should_create_webui(true);
-
- RenderFrameHostManager* manager = static_cast<TestWebContents*>(
- web_contents())->GetRenderManagerForTesting();
-
- NavigateAndCommit(kNormalUrl1);
- EXPECT_EQ(kNormalUrl1,
- manager->current_frame_host()->GetSiteInstance()->GetSiteURL());
- EXPECT_FALSE(manager->web_ui());
- NavigateAndCommit(kWebUIUrl);
- EXPECT_EQ(kWebUIUrl,
- manager->current_frame_host()->GetSiteInstance()->GetSiteURL());
- EXPECT_TRUE(manager->web_ui());
- NavigateAndCommit(kNormalUrl2);
- EXPECT_EQ(kNormalUrl2,
- manager->current_frame_host()->GetSiteInstance()->GetSiteURL());
- EXPECT_FALSE(manager->web_ui());
-}
-
// Tests that we don't end up in an inconsistent state if a page does a back and
// then reload. http://crbug.com/51680
TEST_F(RenderFrameHostManagerTest, PageDoesBackAndReload) {
« 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