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

chrome/browser/captive_portal/captive_portal_tab_helper_unittest.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 "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #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"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using captive_portal::CaptivePortalResult;
 
 namespace {
 
@@ skipping 340 matching lines @@
       content::RenderFrameHostTester::For(subframe3);
   subframe_tester3->SimulateNavigationStart(url);
   subframe_tester3->SimulateNavigationError(url, net::ERR_ABORTED);
   subframe_tester3->SimulateNavigationStop();
 }
 
 // Simulates a subframe erroring out at the same time as a provisional load,
 // 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 =
       content::RenderFrameHostTester::For(main_rfh());
   content::RenderFrameHost* subframe = rfh_tester->AppendChild("subframe");
   content::RenderFrameHostTester* subframe_tester =
       content::RenderFrameHostTester::For(subframe);
 
   // Loads start.
   EXPECT_CALL(mock_reloader(), OnLoadStart(url.SchemeIsCryptographic()))
       .Times(1);
   rfh_tester->SimulateNavigationStart(url);
   subframe_tester->SimulateNavigationStart(url);
 
   // Loads return errors.
   rfh_tester->SimulateNavigationError(url, net::ERR_UNEXPECTED);
   subframe_tester->SimulateNavigationError(url, net::ERR_TIMED_OUT);
 
   // Error page load finishes.
   subframe_tester->SimulateNavigationErrorPageCommit();
   EXPECT_CALL(mock_reloader(), OnLoadCommitted(net::ERR_UNEXPECTED)).Times(1);
   rfh_tester->SimulateNavigationErrorPageCommit();
 }
 
 // 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 =
       content::RenderFrameHostTester::For(main_rfh());
   rfh_tester->SimulateNavigationStart(http_url);
 
   GURL https_url(kHttpsUrl);
   EXPECT_CALL(mock_reloader(), OnRedirect(true)).Times(1);
   rfh_tester->SimulateRedirect(https_url);
 
@@ skipping 107 matching lines @@
   EXPECT_FALSE(tab_helper()->IsLoginTab());
 
   ObservePortalResult(captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL,
                       captive_portal::RESULT_NO_RESPONSE);
   EXPECT_FALSE(tab_helper()->IsLoginTab());
 
   ObservePortalResult(captive_portal::RESULT_NO_RESPONSE,
                       captive_portal::RESULT_INTERNET_CONNECTED);
   EXPECT_FALSE(tab_helper()->IsLoginTab());
 }