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 461 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.

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

Let's change the comment to:
Does a renderer-initiated location.replace navigation to |url|, replacing the
current entry.

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

Argh! Should've caught that one. Thanks!

-bool NavigateToURLAndReplace(Shell* shell, const GURL& url) {
+bool RendererLocationReplace(Shell* shell, const GURL& url) {
   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.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        CorrectLengthWithCurrentItemReplacement) {
   NavigationController& controller =
       shell()->web_contents()->GetController();
 
   EXPECT_TRUE(NavigateToURL(shell(), GURL("data:text/html,page1")));
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(1, RendererHistoryLength(shell()));
 
-  EXPECT_TRUE(NavigateToURLAndReplace(shell(), GURL("data:text/html,page1a")));
+  EXPECT_TRUE(RendererLocationReplace(shell(), GURL("data:text/html,page1a")));
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(1, RendererHistoryLength(shell()));
 
   // Now create two more entries and go back, to test replacing an entry without
   // pruning the forward history.
   EXPECT_TRUE(NavigateToURL(shell(), GURL("data:text/html,page2")));
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(2, RendererHistoryLength(shell()));
 
   EXPECT_TRUE(NavigateToURL(shell(), GURL("data:text/html,page3")));
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(3, RendererHistoryLength(shell()));
 
   controller.GoBack();
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   controller.GoBack();
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   EXPECT_TRUE(controller.CanGoForward());
 
-  EXPECT_TRUE(NavigateToURLAndReplace(shell(), GURL("data:text/html,page1b")));
+  EXPECT_TRUE(RendererLocationReplace(shell(), GURL("data:text/html,page1b")));
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(3, RendererHistoryLength(shell()));
   EXPECT_TRUE(controller.CanGoForward());
 
   // Note that there's no way to access the renderer's notion of the history
   // offset via JavaScript. Checking just the history length, though, is enough;
   // if the replacement failed, there would be a new history entry and thus an
   // incorrect length.
 }
 
@@ skipping 33 matching lines @@
   const GURL page_url = embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html");
 
   // Use data scheme first so that the next page will be loaded
   // in a separate site instance.
   EXPECT_TRUE(NavigateToURL(shell(), GURL("data:text/html,page1")));
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_NE(-1, shell()->web_contents()->GetMaxPageID());
 
   // Now navigate and replace the current entry.
-  NavigateToURLAndReplace(shell(), page_url);
+  RendererLocationReplace(shell(), page_url);
   EXPECT_EQ(1, controller.GetEntryCount());
 
   // Page ID should be updated.
   EXPECT_NE(-1, shell()->web_contents()->GetMaxPageID());
 
   // Reload the page and verify that we don't hit
   // a DCHECK in |RenderFrameImpl::NavigateInternal|.
   controller.Reload(false);
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
 
@@ skipping 373 matching lines @@
   // Make a new entry ...
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
   EXPECT_EQ(3, controller.GetEntryCount());
 
   // ... and replace it with a failed load.
   // TODO(creis): Make this be NEW_PAGE along with the other location.replace
   // cases.  There isn't much impact to having this be EXISTING_PAGE for now.
   // See https://crbug.com/596707.
   {
     FrameNavigateParamsCapturer capturer(root);
-    NavigateToURLAndReplace(shell(), error_url);
+    RendererLocationReplace(shell(), error_url);
     capturer.Wait();
     EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
     NavigationEntry* entry = controller.GetLastCommittedEntry();
     EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
     EXPECT_EQ(3, controller.GetEntryCount());
   }
 
   // Make a new web ui page to force a process swap ...
   GURL web_ui_page(std::string(kChromeUIScheme) + "://" +
                    std::string(kChromeUIGpuHost));
   NavigateToURL(shell(), web_ui_page);
   EXPECT_EQ(4, controller.GetEntryCount());
 
   // ... and replace it with a failed load. (It is NEW_PAGE for the reason noted
   // above.)
   {
     FrameNavigateParamsCapturer capturer(root);
-    NavigateToURLAndReplace(shell(), error_url);
+    RendererLocationReplace(shell(), error_url);
     capturer.Wait();
     EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
     NavigationEntry* entry = controller.GetLastCommittedEntry();
     EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
     EXPECT_EQ(4, controller.GetEntryCount());
   }
 }
 
 // Various tests for navigation type classifications. TODO(avi): It's rather
 // bogus that the same info is in two different enums; http://crbug.com/453555.
@@ skipping 4603 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