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

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

Issue 1199313006: Disable support for swapped out RenderFrame(Host) on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/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 1f793985d736e0a486add35ec67cf128be56ec7c..fa5788e4d5c0b996e7687888df49790430ebaec7 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -506,15 +506,19 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, MAYBE_DisownOpener) {
EXPECT_TRUE(new_shell->web_contents()->HasOpener());
// Now disown the opener.
+ LOG(ERROR) << ">>> Disowning opener";
EXPECT_TRUE(ExecuteScript(new_shell->web_contents(),
"window.opener = null;"));
+ LOG(ERROR) << ">>> Disowning opener - complete";
EXPECT_FALSE(new_shell->web_contents()->HasOpener());
// Go back and ensure the opener is still null.
{
TestNavigationObserver back_nav_load_observer(new_shell->web_contents());
+ LOG(ERROR) << "Navigating back.";
new_shell->web_contents()->GetController().GoBack();
back_nav_load_observer.Wait();
+ LOG(ERROR) << "Navigating back - complete!";
}
success = false;
EXPECT_TRUE(ExecuteScriptAndExtractBool(
@@ -525,7 +529,9 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, MAYBE_DisownOpener) {
EXPECT_FALSE(new_shell->web_contents()->HasOpener());
// Now navigate forward again (creating a new process) and check opener.
+ LOG(ERROR) << "Navigating forward.";
NavigateToURL(new_shell, GetCrossSiteURL("files/title1.html"));
+ LOG(ERROR) << "Navigating forward - complete!";
success = false;
EXPECT_TRUE(ExecuteScriptAndExtractBool(
new_shell->web_contents(),
@@ -1368,17 +1374,22 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
EXPECT_EQ(orig_site_instance.get(),
new_shell->web_contents()->GetSiteInstance());
+ LOG(ERROR) << "Navigating new_shell cross-process";
// 2. Send the second tab to a different process.
NavigateToURL(new_shell, GetCrossSiteURL("files/title1.html"));
+ LOG(ERROR) << "Navigating new_shell cross-process - complete";
scoped_refptr<SiteInstance> new_site_instance(
new_shell->web_contents()->GetSiteInstance());
EXPECT_NE(orig_site_instance, new_site_instance);
// 3. Send the first tab to the second tab's process.
+ LOG(ERROR) << "Navigating shell cross-process";
NavigateToURL(shell(), GetCrossSiteURL("files/title1.html"));
+ LOG(ERROR) << "Navigating shell cross-process - complete";
// Make sure it ends up at the right page.
WaitForLoadStop(shell()->web_contents());
+ LOG(ERROR) << "Waiting for load stop, complete";
EXPECT_EQ(GetCrossSiteURL("files/title1.html"),
shell()->web_contents()->GetLastCommittedURL());
EXPECT_EQ(new_site_instance.get(),

Powered by Google App Engine
This is Rietveld 408576698