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

chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc

 // Copyright 2016 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/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.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"
 #include "ui/base/window_open_disposition.h"
 
 namespace {
 
 const char kNavigationEventCleanUpHistogramName[] =
     "SafeBrowsing.NavigationObserver.NavigationEventCleanUpCount";
 const char kIPAddressCleanUpHistogramName[] =
@@ skipping 145 matching lines @@
                         GURL("http://foo/1"),  // destination_url
                         tab_id,                // source_tab_id
                         tab_id,                // target_tab_id
                         true,                  // is_user_initiated
                         true,                  // has_committed
                         false,                 // has_server_redirect
                         nav_list->Get(0U));
 }
 
 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());
   rfh_tester->SimulateNavigationStart(GURL("http://foo/3"));
   GURL redirect("http://redirect/1");
   rfh_tester->SimulateRedirect(redirect);
   rfh_tester->SimulateNavigationCommit(redirect);
   int tab_id = SessionTabHelper::IdForTab(
       browser()->tab_strip_model()->GetWebContentsAt(0));
   auto* nav_list = navigation_event_list();
@@ skipping 147 matching lines @@
   // Record a host-ip pair, neither of which has been seen before.
   std::string host_1 = GURL("http://bar/1").host();
   RecordHostToIpMapping(host_1, "9.9.9.9");
   ASSERT_EQ(2U, host_to_ip_map()->size());
   EXPECT_EQ(3U, host_to_ip_map()->at(host_0).size());
   EXPECT_EQ(1U, host_to_ip_map()->at(host_1).size());
   EXPECT_EQ("9.9.9.9", host_to_ip_map()->at(host_1).at(0).ip);
 }
 
 }  // namespace safe_browsing