Disable 4 unit tests that are failing with PlzNavigate and Site Isolation.

chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

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..2903521308fca55444e83fad88a71b5fdd6bc414 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
@@ -7,6 +7,7 @@
 #include <memory>
 
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
@@ -20,6 +21,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "net/base/net_errors.h"
@@ -380,6 +382,12 @@ 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() &&
+      base::CommandLine::ForCurrentProcess()->HasSwitch(

[nasko, 2017/03/01 00:24:00]

This should be AreAllSitesIsolatedForTesting() instead of checking for the
specific command line switch.

[jam, 2017/03/01 00:58:31]

Done.

+          switches::kSitePerProcess)) {
+    // 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 +414,12 @@ TEST_F(CaptivePortalTabHelperTest, HttpsSubframeParallelError) {
 
 // Simulates an HTTP to HTTPS redirect, which then times out.
 TEST_F(CaptivePortalTabHelperTest, HttpToHttpsRedirectTimeout) {
+  if (content::IsBrowserSideNavigationEnabled() &&
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSitePerProcess)) {
+    // 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 =