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

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

Issue 1683593002: Don't use pending NavigationEntries for navigation transfers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes from review Created 4 years, 9 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 | « no previous file | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index cf9c8c79ecf8fda878cea954f280ea01daf508e6..a6aef93555b1e3c66be8b3febefcc3bca5261bc6 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -507,12 +507,13 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, SubframeOnEmptyPage) {
ASSERT_EQ(1U, new_root->child_count());
ASSERT_NE(nullptr, new_root->child_at(0));
- // Navigate it.
+ // Navigate it cross-site.
GURL frame_url = embedded_test_server()->GetURL(
- "/navigation_controller/simple_page_2.html");
+ "foo.com", "/navigation_controller/simple_page_2.html");
script = "location.assign('" + frame_url.spec() + "')";
EXPECT_TRUE(content::ExecuteScript(
new_root->child_at(0)->current_frame_host(), script));
+ WaitForLoadStopWithoutSuccessCheck(new_shell->web_contents());
Charlie Reis 2016/03/30 15:26:08 Before the change in this CL, doing this crashes i
alexmos 2016/03/30 16:50:41 Nice!
// Success is not crashing, and not navigating.
EXPECT_EQ(nullptr,
« no previous file with comments | « no previous file | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698