Removing ShouldSwapProcessesForRedirect (using DoesSiteRequireDedicatedProcess).

chrome/browser/prerender/prerender_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 <stddef.h>
 #include <deque>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ skipping 494 matching lines @@
         site_instance->GetBrowserContext())
         ->CancelAllPrerenders();
     return ChromeContentBrowserClient::ShouldAllowOpenURL(site_instance,
                                                                   url);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestContentBrowserClient);
 };
 
-// A ContentBrowserClient that forces cross-process navigations.
-class SwapProcessesContentBrowserClient : public ChromeContentBrowserClient {
- public:
-  SwapProcessesContentBrowserClient() {}
-  ~SwapProcessesContentBrowserClient() override {}
-
-  // ChromeContentBrowserClient:
-  bool ShouldSwapProcessesForRedirect(
-      content::BrowserContext* browser_context,
-      const GURL& current_url,
-      const GURL& new_url) override {
-    return true;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SwapProcessesContentBrowserClient);
-};
-
 base::FilePath GetTestPath(const std::string& file_name) {
   return ui_test_utils::GetTestFilePath(
       base::FilePath(FILE_PATH_LITERAL("prerender")),
       base::FilePath().AppendASCII(file_name));
 }
 
 page_load_metrics::PageLoadExtraInfo GenericPageLoadExtraInfo(
     const GURL& dest_url) {
   return page_load_metrics::PageLoadExtraInfo::CreateForTesting(
       dest_url, false /* started_in_foreground */);
@@ skipping 2398 matching lines @@
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCapturedWebContents) {
   PrerenderTestURL("/prerender/prerender_page.html",
                    FINAL_STATUS_PAGE_BEING_CAPTURED, 1);
   WebContents* web_contents = GetActiveWebContents();
   web_contents->IncrementCapturerCount(gfx::Size());
   NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, false);
   web_contents->DecrementCapturerCount();
 }
 
 // Checks that prerenders are aborted on cross-process navigation from
-// a server redirect.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
-                       PrerenderCrossProcessServerRedirect) {
-  // Cross-process navigations don't happen for prerendering with PlzNavigate,
-  // since we decide on a process after redirects are followed.
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
-  // Force everything to be a process swap.
-  SwapProcessesContentBrowserClient test_browser_client;
-  content::ContentBrowserClient* original_browser_client =
-      content::SetBrowserClientForTesting(&test_browser_client);
-
-  PrerenderTestURL(CreateServerRedirect("/prerender/prerender_page.html"),
-                   FINAL_STATUS_OPEN_URL, 0);
-
-  content::SetBrowserClientForTesting(original_browser_client);
-}
-
-// Checks that URLRequests for prerenders being aborted on cross-process
-// navigation from a server redirect are cleaned up, so they don't keep cache
-// entries locked.
-// See http://crbug.com/341134
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
-                       PrerenderCrossProcessServerRedirectNoHang) {
-  // Cross-process navigations don't happen for prerendering with PlzNavigate,
-  // since we decide on a process after redirects are followed.
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
-  const char kDestPath[] = "/prerender/prerender_page.html";
-  // Force everything to be a process swap.
-  SwapProcessesContentBrowserClient test_browser_client;
-  content::ContentBrowserClient* original_browser_client =
-      content::SetBrowserClientForTesting(&test_browser_client);
-
-  PrerenderTestURL(CreateServerRedirect(kDestPath), FINAL_STATUS_OPEN_URL, 0);
-
-  ui_test_utils::NavigateToURL(browser(),
-                               embedded_test_server()->GetURL(kDestPath));
-
-  content::SetBrowserClientForTesting(original_browser_client);
-}
-
-// Checks that prerenders are aborted on cross-process navigation from
 // a client redirect.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                        PrerenderCrossProcessClientRedirect) {
   // Cross-process navigation logic for renderer-initiated navigations
   // is partially controlled by the renderer, namely
   // ChromeContentRendererClient. This test instead relies on the Web
   // Store triggering such navigations.
   GURL webstore_url = extension_urls::GetWebstoreLaunchURL();
 
   // Mock out requests to the Web Store.
@@ skipping 915 matching lines @@
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
                                                    "DidDisplayReallyPass()",
                                                    &display_test_result));
   ASSERT_TRUE(display_test_result);
 }
 #endif  // !defined(DISABLE_NACL)
 
 }  // namespace prerender
 
 #endif  // !defined(OS_MACOSX) || !defined(ADDRESS_SANITIZER)