Fix for the NavigationControllerTest.BackSubframe test failures with PlzNavigate

content/browser/frame_host/navigation_controller_impl_unittest.cc

Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index b01157bf13be2272044ab388e6344253a3bf35f3..a25c4ee3533a079eb846166cd71ed618222f0836 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -2460,6 +2460,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
 
   // Compute the sequence number assigned by Blink.
   int64_t item_sequence_number1 = base::Time::Now().ToDoubleT() * 1000000;
+  int64_t document_sequence_number1 = base::Time::Now().ToDoubleT() * 1000000;

[nasko, 2016/09/08 00:18:59]

Let's use the same strategy that Blink uses for those. It starts off with a
number based on time, but then increments it from there on. It guarantees that
we won't get two sequence numbers that match.

https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/loader/Hi...

[ananta, 2016/09/08 00:41:38]

Thanks. Added a function GenerateSequenceNumbers() which mimics that.

 
   {
     FrameHostMsg_DidCommitProvisionalLoad_Params params;
@@ -2472,7 +2473,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {
     params.should_update_history = false;
     params.gesture = NavigationGestureUser;
     params.method = "GET";
-    params.page_state = PageState::CreateFromURL(subframe_url);
+    params.page_state = PageState::CreateForTestingWithSequenceNumbers(
+        subframe_url, item_sequence_number1, document_sequence_number1);
     params.item_sequence_number = item_sequence_number1;
 
     // Navigating should do nothing.
@@ -2491,6 +2493,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
   // First manual subframe navigation.
   const GURL url2("http://foo2");
   int64_t item_sequence_number2 = base::Time::Now().ToDoubleT() * 1000000;
+  int64_t document_sequence_number2 = base::Time::Now().ToDoubleT() * 1000000;
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.page_id = 2;
   params.nav_entry_id = 0;
@@ -2501,7 +2504,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {
   params.should_update_history = false;
   params.gesture = NavigationGestureUser;
   params.method = "GET";
-  params.page_state = PageState::CreateFromURL(url2);
+  params.page_state = PageState::CreateForTestingWithSequenceNumbers(
+      url2, item_sequence_number2, document_sequence_number2);
   params.item_sequence_number = item_sequence_number2;
 
   // This should generate a new entry.
@@ -2526,14 +2530,17 @@ TEST_F(NavigationControllerTest, BackSubframe) {
 
   // Second manual subframe navigation should also make a new entry.
   const GURL url3("http://foo3");
+  int64_t item_sequence_number3 = base::Time::Now().ToDoubleT() * 1000000;
+  int64_t document_sequence_number3 = base::Time::Now().ToDoubleT() * 1000000;
   params.page_id = 3;
   params.nav_entry_id = 0;
   params.frame_unique_name = unique_name;
   params.did_create_new_entry = true;
   params.url = url3;
   params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
-  params.page_state = PageState::CreateFromURL(url3);
-  params.item_sequence_number = base::Time::Now().ToDoubleT() * 1000000;
+  params.item_sequence_number = item_sequence_number3;

[nasko, 2016/09/08 00:18:59]

Let's be consistent and set ISN and DSN for each params struct in all of the
cases. This will bring the code closer to how it behaves in reality.

[ananta, 2016/09/08 00:41:38]

Done.

+  params.page_state = PageState::CreateForTestingWithSequenceNumbers(
+    url3, item_sequence_number3, document_sequence_number3);
   subframe->SendRendererInitiatedNavigationRequest(url3, false);
   subframe->PrepareForCommit();
   subframe->SendNavigateWithParams(&params);
@@ -2561,7 +2568,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {
   params.did_create_new_entry = false;
   params.url = url2;
   params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
-  params.page_state = PageState::CreateFromURL(url2);
+  params.page_state = PageState::CreateForTestingWithSequenceNumbers(
+    url2, item_sequence_number2, document_sequence_number2);
   params.item_sequence_number = item_sequence_number2;
   subframe->PrepareForCommit();
   subframe->SendNavigateWithParams(&params);
@@ -2581,7 +2589,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {
   params.did_create_new_entry = false;
   params.url = subframe_url;
   params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
-  params.page_state = PageState::CreateFromURL(subframe_url);
+  params.page_state = PageState::CreateForTestingWithSequenceNumbers(
+    subframe_url, item_sequence_number1, document_sequence_number1);
   params.item_sequence_number = item_sequence_number1;
   subframe->PrepareForCommit();
   subframe->SendNavigateWithParams(&params);