PlzNavigate: fix RFHM test SameOriginFramesInDifferentProcesses

content/browser/frame_host/render_frame_host_manager_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 2636 matching lines @@
   // Wait for the navigation in the new tab to finish, if it hasn't.
   WaitForLoadStop(new_shell->web_contents());
   EXPECT_EQ("/navigate_opener.html",
             new_shell->web_contents()->GetLastCommittedURL().path());
 
   // Do a cross-site navigation that winds up same-site. The same-site
   // navigation to a.com will commit in a different process than the original
   // a.com window.
   NavigateToURL(new_shell, embedded_test_server()->GetURL(
                                "b.com", "/cross-site/a.com/title1.html"));
-  if (AreAllSitesIsolatedForTesting()) {
+  if (AreAllSitesIsolatedForTesting() || IsBrowserSideNavigationEnabled()) {
     // In --site-per-process mode, both windows will actually be in the same
     // process.
+    // PlzNavigate: the SiteInstance for the navigation is determined after the
+    // redirect. So both windows will actually be in the same process.
     EXPECT_EQ(shell()->web_contents()->GetSiteInstance(),
               new_shell->web_contents()->GetSiteInstance());
   } else {
     EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
               new_shell->web_contents()->GetSiteInstance());
   }
 
   std::string result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
       "window.domAutomationController.send((function() {\n"
       "  try {\n"
       "    return getLastOpenedWindowLocation();\n"
       "  } catch (e) {\n"
       "    return e.toString();\n"
       "  }\n"
       "})())",
       &result));
-  if (AreAllSitesIsolatedForTesting()) {
+  if (AreAllSitesIsolatedForTesting() || IsBrowserSideNavigationEnabled()) {
     EXPECT_THAT(result,
                 ::testing::MatchesRegex("http://a.com:\\d+/title1.html"));
   } else {
     // Accessing a property with normal security checks should throw a
     // SecurityError if the same-origin windows are in different processes.
     EXPECT_THAT(result,
                 ::testing::MatchesRegex("SecurityError: Blocked a frame with "
                                         "origin \"http://a.com:\\d+\" from "
                                         "accessing a cross-origin frame."));
   }
 }
 
 }  // namespace content