Fix NavigationControllerBrowserTest.PageIDUpdatedOnPageReplacement.

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 557 matching lines @@
 
 // Check that we will not trigger a DCHECK in renderer for cross-process
 // replacement navigations.
 // See https://crbug.com/611679.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        PageIDUpdatedOnPageReplacement) {
   NavigationController& controller = shell()->web_contents()->GetController();
   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
+  // Use a chrome:// url first so that the next page will be loaded
   // in a separate site instance.
-  EXPECT_TRUE(NavigateToURL(shell(), GURL("data:text/html,page1")));
+  GURL initial_url(std::string(kChromeUIScheme) +
+                   url::kStandardSchemeSeparator + kChromeUIGpuHost);
+  EXPECT_TRUE(NavigateToURL(shell(), initial_url));
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_NE(-1, shell()->web_contents()->GetMaxPageID());
+  int initial_renderer_id =
+      shell()->web_contents()->GetRenderProcessHost()->GetID();

[nasko, 2016/09/14 22:33:22]

nit: Usually SiteInstance is used for comparison whether cross-process
navigation has occurred.

 
   // Now navigate and replace the current entry.
   RendererLocationReplace(shell(), page_url);
+
+  // Verify that process swap actually occured.
+  EXPECT_NE(initial_renderer_id,
+            shell()->web_contents()->GetRenderProcessHost()->GetID());
+
+  // The navigation entry should have been replaced.
   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 5321 matching lines @@
       &headers));
 
   // Verify the Origin and Referer headers.
   EXPECT_THAT(headers, ::testing::HasSubstr("Origin: null"));
   EXPECT_THAT(headers,
               ::testing::ContainsRegex(
                   "Referer: http://a.com:.*/form_that_posts_cross_site.html"));
 }
 
 }  // namespace content