| Index: chrome/browser/ui/browser_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
|
| index 294d095bb92b9f240e8ec832bc0d8815f184d36e..62e989d10f2bfa2cc8b56e931f0b520613284e67 100644
|
| --- a/chrome/browser/ui/browser_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_browsertest.cc
|
| @@ -204,15 +204,14 @@ class MockTabStripModelObserver : public TabStripModelObserver {
|
| DISALLOW_COPY_AND_ASSIGN(MockTabStripModelObserver);
|
| };
|
|
|
| -// Causes the browser to swap processes on a redirect to an HTTPS URL.
|
| -class TransferHttpsRedirectsContentBrowserClient
|
| +// Causes the browser to ask for dedicated processes for HTTPS URL.
|
| +class TransferHttpsSitesContentBrowserClient
|
| : public ChromeContentBrowserClient {
|
| public:
|
| - bool ShouldSwapProcessesForRedirect(
|
| + bool DoesSiteRequireDedicatedProcess(
|
| content::BrowserContext* browser_context,
|
| - const GURL& current_url,
|
| - const GURL& new_url) override {
|
| - return new_url.SchemeIs(url::kHttpsScheme);
|
| + const GURL& effective_site_url) override {
|
| + return effective_site_url.SchemeIs(url::kHttpsScheme);
|
| }
|
| };
|
|
|
| @@ -783,8 +782,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NoStopDuringTransferUntilCommit) {
|
| ASSERT_TRUE(https_test_server.Start());
|
|
|
| // Temporarily replace ContentBrowserClient with one that will cause a
|
| - // process swap on all redirects to HTTPS URLs.
|
| - TransferHttpsRedirectsContentBrowserClient new_client;
|
| + // process swap for all HTTPS URLs.
|
| + TransferHttpsSitesContentBrowserClient new_client;
|
| content::ContentBrowserClient* old_client =
|
| SetBrowserClientForTesting(&new_client);
|
|
|
| @@ -834,8 +833,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SingleBeforeUnloadAfterRedirect) {
|
| ASSERT_TRUE(https_test_server.Start());
|
|
|
| // Temporarily replace ContentBrowserClient with one that will cause a
|
| - // process swap on all redirects to HTTPS URLs.
|
| - TransferHttpsRedirectsContentBrowserClient new_client;
|
| + // process swap for all HTTPS URLs.
|
| + TransferHttpsSitesContentBrowserClient new_client;
|
| content::ContentBrowserClient* old_client =
|
| SetBrowserClientForTesting(&new_client);
|
|
|
|
|