Fix expectations of a few CSP tests with PlzNavigate.

content/browser/site_per_process_browsertest.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 "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 7402 matching lines @@
   TestNavigationObserver load_observer(shell()->web_contents());
   GURL blocked_url = embedded_test_server()->GetURL("c.com", "/title3.html");
   EXPECT_TRUE(ExecuteScript(root->child_at(0), "window.location.href = '" +
                                                    blocked_url.spec() + "';"));
 
   // The blocked frame should still fire a load event in its parent's process.
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   // Check that the current RenderFrameHost has stopped loading.
   if (root->child_at(0)->current_frame_host()->is_loading()) {
-    ADD_FAILURE() << "Blocked RenderFrameHost shouldn't be loading anything";
+    if (!IsBrowserSideNavigationEnabled())
+      ADD_FAILURE() << "Blocked RenderFrameHost shouldn't be loading anything";
     load_observer.Wait();
   }
 
   // The blocked frame should stay at the old location.
   EXPECT_EQ(old_subframe_url, root->child_at(0)->current_url());
 
   // The blocked frame should keep the old title.
   std::string frame_title;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       root->child_at(0), "domAutomationController.send(document.title)",
@@ skipping 54 matching lines @@
   TestNavigationObserver load_observer2(shell()->web_contents());
   GURL blocked_url = embedded_test_server()->GetURL("c.com", "/title3.html");
   EXPECT_TRUE(ExecuteScript(root->child_at(0), "window.location.href = '" +
                                                    blocked_url.spec() + "';"));
 
   // The blocked frame should still fire a load event in its parent's process.
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   // Check that the current RenderFrameHost has stopped loading.
   if (root->child_at(0)->current_frame_host()->is_loading()) {
-    ADD_FAILURE() << "Blocked RenderFrameHost shouldn't be loading anything";
+    if (!IsBrowserSideNavigationEnabled())
+      ADD_FAILURE() << "Blocked RenderFrameHost shouldn't be loading anything";
     load_observer2.Wait();

[nasko, 2017/03/17 21:21:31]

I think it will be slightly better to change the conditions. We know with
PlzNavigate we will commit an error page and in current mode we will not. So
making it if (PlzNavigate) Wait, else EXPECT(not loading) is a bit easier to
understand. It will be easier to clean up too, since we can just get rid of the
else branch and remove the conditional later on.

   }
 
   // The blocked frame should stay at the old location.
   EXPECT_EQ(old_subframe_url, root->child_at(0)->current_url());
 
   // The blocked frame should keep the old title.
   std::string frame_title;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       root->child_at(0), "domAutomationController.send(document.title)",
       &frame_title));
@@ skipping 47 matching lines @@
   TestNavigationObserver load_observer2(shell()->web_contents());
   GURL blocked_url = embedded_test_server()->GetURL("c.com", "/title3.html");
   EXPECT_TRUE(ExecuteScript(navigating_frame, "window.location.href = '" +
                                                   blocked_url.spec() + "';"));
 
   // The blocked frame should still fire a load event in its parent's process.
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   // Check that the current RenderFrameHost has stopped loading.
   if (navigating_frame->current_frame_host()->is_loading()) {
-    ADD_FAILURE() << "Blocked RenderFrameHost shouldn't be loading anything";
+    if (!IsBrowserSideNavigationEnabled())
+      ADD_FAILURE() << "Blocked RenderFrameHost shouldn't be loading anything";
     load_observer2.Wait();
   }
 
   // The blocked frame should stay at the old location.
   EXPECT_EQ(old_subframe_url, navigating_frame->current_url());
 
   // The blocked frame should keep the old title.
   std::string frame_title;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       navigating_frame, "domAutomationController.send(document.title)",
@@ skipping 2263 matching lines @@
 
   // Try the same navigation, but use the browser-initiated path.
   NavigateFrameToURL(root->child_at(0), frame_url);
   EXPECT_FALSE(root->child_at(0)->render_manager()->pending_frame_host());
   EXPECT_EQ(root->child_at(0)->current_url(), redirected_url);
   EXPECT_EQ(b_site_instance,
             root->child_at(0)->current_frame_host()->GetSiteInstance());
 }
 
 }  // namespace content