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

chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc

Index: chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc
index 59eaa0ddcd2045da8c641fac5557aa8890ff773b..4733eef3afceaa68f5c94c2d3e16d4523a86da14 100644
--- a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/test/histogram_tester.h"
 #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer.h"

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

nit: Empty line after this include.

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

this was changed by git cl format, so if I change it now it'll change the next
time the headers are changed..

[nasko, 2017/03/01 01:03:32]

git cl format respects ordering within sets of headers separated by empty lines,
therefore it "should just work" or so I am told :).

[jam, 2017/03/01 01:06:10]

Done.

+#include "base/command_line.h"
+#include "base/test/histogram_tester.h"
 #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/browser_with_test_window_test.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 "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -173,6 +176,12 @@ TEST_F(SBNavigationObserverTest, BasicNavigationAndCommit) {
 }
 
 TEST_F(SBNavigationObserverTest, ServerRedirect) {
+  if (content::IsBrowserSideNavigationEnabled() &&
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSitePerProcess)) {
+    // http://crbug.com/674734 Fix this test with PlzNavigate and Site Isolation
+    return;
+  }
   content::RenderFrameHostTester* rfh_tester =
       content::RenderFrameHostTester::For(
           browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame());