Fix tests to behave properly with ISNs/DSNs.

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 462 matching lines @@
 namespace {
 
 int RendererHistoryLength(Shell* shell) {
   int value = 0;
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
       shell, "domAutomationController.send(history.length)", &value));
   return value;
 }
 
 // Similar to the ones from content_browser_test_utils.
 bool NavigateToURLAndReplace(Shell* shell, const GURL& url) {

[Charlie Reis, 2016/08/08 21:27:11]

I'm torn about the name.  It sounds a lot like the browser-initiated
NavigateToURL case, so it's confusing that it's now renderer-initiated (even
though there isn't really a way to do a browser-initiated navigation with
replacement in practice).

Can we find a different name that avoids the NavigateToURL connotation?  And we
should definitely update the comment to point out it's renderer-initiated.

[nasko, 2016/08/08 21:57:08]

How about RendererLocationReplace, which follows the naming of the method above
(RendererHistoryLenght)?

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

Sounds good, thanks.

   WebContents* web_contents = shell->web_contents();
   WaitForLoadStop(web_contents);
   TestNavigationObserver same_tab_observer(web_contents, 1);
-  NavigationController::LoadURLParams params(url);
-  params.should_replace_current_entry = true;
-  web_contents->GetController().LoadURLWithParams(params);
-  web_contents->Focus();
+  EXPECT_TRUE(
+      ExecuteScript(shell, "window.location.replace('" + url.spec() + "');"));
   same_tab_observer.Wait();
   if (!IsLastCommittedEntryOfPageType(web_contents, PAGE_TYPE_NORMAL))
     return false;
   return web_contents->GetLastCommittedURL() == url;
 }
 
 }  // namespace
 
 // When loading a new page to replace an old page in the history list, make sure
 // that the browser and renderer agree, and that both get it right.
@@ skipping 5109 matching lines @@
   if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
     EXPECT_EQ(1U, nav_entry->root_node()->children.size());
     EXPECT_EQ(tree_node, nav_entry->root_node()->children[0]);
   }
 
   EXPECT_TRUE(ExecuteScript(root, kRemoveFrameScript));
   EXPECT_EQ(0U, root->child_count());
 }
 
 }  // namespace content