Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

Issue 2726433004: Disable 4 unit tests that are failing with PlzNavigate and Site Isolation. (Closed)
Patch Set: nit Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « no previous file | chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698