Fix setHistoryItemStateForCommit for back/forward in subframes.

content/browser/frame_host/navigation_controller_impl_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_controller_impl.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 2653 matching lines @@
     EXPECT_EQ(frame_url_b,
               entry4->root_node()->children[0]->frame_entry->url());
     EXPECT_EQ(
         frame_url_c,
         entry4->root_node()->children[0]->children[0]->frame_entry->url());
   } else {
     // There are no subframe FrameNavigationEntries by default.
     EXPECT_EQ(0U, entry4->root_node()->children.size());
   }
 
+  // Remember the DSNs for later.
+  int64_t root_dsn =
+      entry4->root_node()->frame_entry->document_sequence_number();
+  int64_t frame_b_dsn = -1;
+  int64_t frame_c_dsn = -1;
+  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
+    frame_b_dsn = entry4->root_node()
+                      ->children[0]
+                      ->frame_entry->document_sequence_number();
+    frame_c_dsn = entry4->root_node()
+                      ->children[0]
+                      ->children[0]
+                      ->frame_entry->document_sequence_number();
+  }
+
   // 5. Navigate main frame cross-site, destroying the frames.
   GURL main_url_d(embedded_test_server()->GetURL(
       "d.com", "/navigation_controller/simple_page_2.html"));
   NavigateToURL(shell(), main_url_d);
   ASSERT_EQ(0U, root->child_count());
   EXPECT_EQ(main_url_d, root->current_url());
 
   EXPECT_EQ(5, controller.GetEntryCount());
   EXPECT_EQ(4, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry5 = controller.GetLastCommittedEntry();
   EXPECT_EQ(0U, entry5->root_node()->children.size());
 
   // 6. Go back, recreating the iframe and its nested iframe.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     shell()->web_contents()->GetController().GoBack();
     back_load_observer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   ASSERT_EQ(1U, root->child_at(0)->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(frame_url_b, root->child_at(0)->current_url());
   EXPECT_EQ(frame_url_c, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(5, controller.GetEntryCount());
   EXPECT_EQ(3, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry4, controller.GetLastCommittedEntry());
 
+  // The main frame should not have changed its DSN.
+  EXPECT_EQ(root_dsn,
+            entry4->root_node()->frame_entry->document_sequence_number());
+
   // Verify subframe entries if they're enabled (e.g. in --site-per-process).
   if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
     // The entry should have FrameNavigationEntries for the subframes.
     ASSERT_EQ(1U, entry4->root_node()->children.size());
     ASSERT_EQ(1U, entry4->root_node()->children[0]->children.size());
     EXPECT_EQ(frame_url_b,
               entry4->root_node()->children[0]->frame_entry->url());
     EXPECT_EQ(
         frame_url_c,
         entry4->root_node()->children[0]->children[0]->frame_entry->url());
+
+    // The subframes should not have changed their DSNs.
+    // See https://crbug.com/628286.
+    EXPECT_EQ(frame_b_dsn, entry4->root_node()
+                               ->children[0]
+                               ->frame_entry->document_sequence_number());
+    EXPECT_EQ(frame_c_dsn, entry4->root_node()
+                               ->children[0]
+                               ->children[0]
+                               ->frame_entry->document_sequence_number());

[alexmos, 2016/07/14 23:03:27]

Makes sense - without the fix, these DSNs were freshly generated by
HistoryItem::create() rather than restored, right?

[Charlie Reis, 2016/07/14 23:25:01]

Exactly.

   } else {
     // There are no subframe FrameNavigationEntries by default.
     EXPECT_EQ(0U, entry4->root_node()->children.size());
   }
 
   // Inject a JS value so that we can check for it later.
   EXPECT_TRUE(content::ExecuteScript(root, "foo=3;"));
 
   // 7. Go back again, to the data URL in the nested iframe.
   {
@@ skipping 2200 matching lines @@
   std::string body;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
       "window.domAutomationController.send("
       "document.getElementsByTagName('pre')[0].innerText);",
       &body));
   EXPECT_EQ("text=value\n", body);
 }
 
 }  // namespace content