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

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

Issue 2584513003: PlzNavigate: identify same-page browser-initiated navigation. (Closed)
Patch Set: Fix 2 WebContentsImplTest by assigning a document_sequence_number. 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
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 af3a4999865428e40593d9cde1d99fc5b55f3435..43512930d1b6062e6734de47df55aefa92db9e4e 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -6168,8 +6168,27 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
// Wait for the back navigation to commit as well.
history_commit_observer.Wait();
+
+ // The expected state of the history:
+ // Without BrowserSideNavigation:
+ // -> a.com/title1.html
+ // a.com/title1.html#foo
+ // suborigin.a.com/title2.html
+ //
+ // With BrowserSideNavigation:
+ // a.com/title1.html
+ // a.com/title1.html#foo
+ // suborigin.a.com/title2.html
+ // -> a.com/title1.html
clamy 2017/01/09 16:58:48 Why do we have a different history state in the Pl
arthursonzogni 2017/01/12 17:32:29 The navigation is relaunched from the renderer by
EXPECT_EQ(start_url, web_contents->GetLastCommittedURL());
- EXPECT_EQ(0, web_contents->GetController().GetLastCommittedEntryIndex());
+ if (IsBrowserSideNavigationEnabled()) {
+ EXPECT_EQ(3, web_contents->GetController().GetLastCommittedEntryIndex());
+ EXPECT_EQ(4, web_contents->GetController().GetEntryCount());
+ }
+ else {
+ EXPECT_EQ(0, web_contents->GetController().GetLastCommittedEntryIndex());
+ EXPECT_EQ(3, web_contents->GetController().GetEntryCount());
+ }
// Verify the expected origin through JavaScript. It also has the additional
// verification of the process also being still alive.

Powered by Google App Engine
This is Rietveld 408576698