| Index: chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
|
| diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
|
| index b30602a54618a9b5ed9729b79cfb5a6e909e7367..19a1f6a60cf39b83feddfe6d494cac05a6882574 100644
|
| --- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
|
| +++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
|
| @@ -21,6 +21,7 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/browser_side_navigation_policy.h"
|
| #include "content/public/test/test_renderer_host.h"
|
| +#include "content/public/test/test_utils.h"
|
| #include "content/public/test/web_contents_tester.h"
|
| #include "net/base/net_errors.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -380,6 +381,11 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframe) {
|
| // but with a different error code. Make sure the TabHelper sees the correct
|
| // error.
|
| TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) {
|
| + if (content::IsBrowserSideNavigationEnabled() &&
|
| + content::AreAllSitesIsolatedForTesting()) {
|
| + // http://crbug.com/674734 Fix this test with PlzNavigate and Site Isolation
|
| + return;
|
| + }
|
| // URL used by both frames.
|
| GURL url = GURL(kHttpsUrl);
|
| content::RenderFrameHostTester* rfh_tester =
|
| @@ -406,6 +412,11 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) {
|
|
|
| // Simulates an HTTP to HTTPS redirect, which then times out.
|
| TEST_F(CaptivePortalTabHelperTest, HttpToHttpsRedirectTimeout) {
|
| + if (content::IsBrowserSideNavigationEnabled() &&
|
| + content::AreAllSitesIsolatedForTesting()) {
|
| + // http://crbug.com/674734 Fix this test with PlzNavigate and Site Isolation
|
| + return;
|
| + }
|
| GURL http_url(kHttpUrl);
|
| EXPECT_CALL(mock_reloader(), OnLoadStart(false)).Times(1);
|
| content::RenderFrameHostTester* rfh_tester =
|
|
|