Removing ShouldSwapProcessesForRedirect (using DoesSiteRequireDedicatedProcess).

content/browser/cross_site_transfer_browsertest.cc

 // Copyright (c) 2012 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 <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 252 matching lines @@
   const NavigationController& controller =
       shell()->web_contents()->GetController();
 
   // Navigate to a starting URL, so there is a history entry to replace.
   GURL url1 = embedded_test_server()->GetURL("/site_isolation/blank.html?1");
   EXPECT_TRUE(NavigateToURL(shell(), url1));
 
   // Force all future navigations to transfer. Note that this includes same-site
   // navigiations which may cause double process swaps (via OpenURL and then via
   // transfer). This test intentionally exercises that case.
-  ShellContentBrowserClient::SetSwapProcessesForRedirect(true);
+  ShellContentBrowserClient::SetTransferAllNavigations(true);
 
   // Navigate to a page on A.com with entry replacement. This navigation is
   // cross-site, so the renderer will send it to the browser via OpenURL to give
   // to a new process. It will then be transferred into yet another process due
   // to the call above.
   GURL url2 =
       embedded_test_server()->GetURL("A.com", "/site_isolation/blank.html?2");
   // Used to make sure the request for url2 succeeds, and there was only one of
   // them.
   tracking_delegate().SetTrackedURL(url2);
@@ skipping 39 matching lines @@
       shell()->web_contents()->GetController();
 
   // Navigate to a starting URL, so there is a history entry to replace.
   GURL url = embedded_test_server()->GetURL("/site_isolation/blank.html?1");
   EXPECT_TRUE(NavigateToURL(shell(), url));
 
   // Force all future navigations to transfer. Note that this includes same-site
   // navigiations which may cause double process swaps (via OpenURL and then via
   // transfer). All navigations in this test are same-site, so it only swaps
   // processes via request transfer.
-  ShellContentBrowserClient::SetSwapProcessesForRedirect(true);
+  ShellContentBrowserClient::SetTransferAllNavigations(true);
 
   // Navigate in-process with entry replacement. It will then be transferred
   // into a new one due to the call above.
   GURL url2 = embedded_test_server()->GetURL("/site_isolation/blank.html?2");
   NavigateToURLContentInitiated(shell(), url2, true, true);
 
   // There should be one history entry. url2 should have replaced url1.
   EXPECT_TRUE(controller.GetPendingEntry() == nullptr);
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetCurrentEntryIndex());
@@ skipping 61 matching lines @@
 // cancelled.
 IN_PROC_BROWSER_TEST_P(CrossSiteTransferTest, NoLeakOnCrossSiteCancel) {
   const NavigationController& controller =
       shell()->web_contents()->GetController();
 
   // Navigate to a starting URL, so there is a history entry to replace.
   GURL url1 = embedded_test_server()->GetURL("/site_isolation/blank.html?1");
   EXPECT_TRUE(NavigateToURL(shell(), url1));
 
   // Force all future navigations to transfer.
-  ShellContentBrowserClient::SetSwapProcessesForRedirect(true);
+  ShellContentBrowserClient::SetTransferAllNavigations(true);
 
   NoTransferRequestDelegate no_transfer_request_delegate;
   WebContentsDelegate* old_delegate = shell()->web_contents()->GetDelegate();
   shell()->web_contents()->SetDelegate(&no_transfer_request_delegate);
 
   // Navigate to a page on A.com with entry replacement. This navigation is
   // cross-site, so the renderer will send it to the browser via OpenURL to give
   // to a new process. It will then be transferred into yet another process due
   // to the call above.
   GURL url2 =
@@ skipping 84 matching lines @@
   EXPECT_THAT(actual_page_body,
               ::testing::HasSubstr("form-data; name=\"file\""));
 }
 
 INSTANTIATE_TEST_CASE_P(CrossSiteTransferTest,
                         CrossSiteTransferTest,
                         ::testing::Values(TestParameter::LOADING_WITHOUT_MOJO,
                                           TestParameter::LOADING_WITH_MOJO));
 
 }  // namespace content