Fix tests to behave properly with ISNs/DSNs.

content/test/test_render_frame_host.cc

 // Copyright 2013 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/test/test_render_frame_host.h"
 
 #include "base/guid.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
@@ skipping 298 matching lines @@
   params.method = "GET";
   params.http_status_code = response_code;
   params.socket_address.set_host("2001:db8::1");
   params.socket_address.set_port(80);
   params.history_list_was_cleared = simulate_history_list_was_cleared_;
   params.original_request_url = url_copy;
 
   // Simulate Blink assigning an item sequence number to the navigation.
   params.item_sequence_number = base::Time::Now().ToDoubleT() * 1000000;
 
+  // When the user hits enter in the Omnibox without changing the URL, Blink
+  // behaves similarly to a reload and does not change the item and document
+  // sequence numbers. Simulate this behavior here too.
+  // TODO(nasko): If/when NAVIGATION_TYPE_SAME_PAGE is removed from the
+  // codebase, ensure this code is updated to account for it.

[Charlie Reis, 2016/08/08 22:06:15]

I don't think we actually need the TODO, since Blink's behavior likely won't
change when we remove the classification.  (I was just trying to convince myself
as much when I mentioned it.)  :)

[nasko, 2016/08/08 22:39:47]

Acknowledged.

+  if (transition == ui::PAGE_TRANSITION_TYPED) {
+    const NavigationEntryImpl* entry =
+        static_cast<NavigationEntryImpl*>(frame_tree_node()
+                                              ->navigator()
+                                              ->GetController()
+                                              ->GetLastCommittedEntry());
+    if (entry && entry->GetURL() == url) {
+      FrameNavigationEntry* frame_entry =
+          entry->GetFrameEntry(frame_tree_node());
+      if (frame_entry) {
+        params.item_sequence_number = frame_entry->item_sequence_number();
+        params.document_sequence_number =
+            frame_entry->document_sequence_number();
+      }
+    }
+  }
+
   // In most cases, the origin will match the URL's origin.  Tests that need to
   // check corner cases (like about:blank) should specify the origin param
   // manually.
   url::Origin origin(url_copy);
   params.origin = origin;
 
   url::Replacements<char> replacements;
   replacements.ClearRef();
   params.was_within_same_page =
       !ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) &&
@@ skipping 127 matching lines @@
 void TestRenderFrameHost::SimulateWillStartRequest(
     ui::PageTransition transition) {
   if (!navigation_handle())
     return;
   navigation_handle()->CallWillStartRequestForTesting(
       false /* is_post */, Referrer(GURL(), blink::WebReferrerPolicyDefault),
       true /* user_gesture */, transition, false /* is_external_protocol */);
 }
 
 }  // namespace content