Revert of PlzNavigate: Enforce 'frame-src' CSP on the browser.

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 2390 matching lines @@
         "      B = http://b.com/",
         DepictFrameTree(root));
     EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
               child->current_frame_host()->GetSiteInstance());
   }
 
   // The FrameTreeNode should update its URL (so that we don't affect other uses
   // of the API), but the frame's last_successful_url shouldn't change and the
   // origin should be empty.
   // PlzNavigate: We have switched RenderFrameHosts for the subframe, so the
-  // last successful url should be empty (since the frame only loaded an error
+  // last succesful url should be empty (since the frame only loaded an error
   // page).
   if (IsBrowserSideNavigationEnabled())
     EXPECT_EQ(GURL(), child->current_frame_host()->last_successful_url());
   else
     EXPECT_EQ(url_a, child->current_frame_host()->last_successful_url());
   EXPECT_EQ(url_b, child->current_url());
   EXPECT_EQ("null", child->current_origin().Serialize());
 
   // Try again after re-enabling host resolution.
   host_resolver()->AddRule("*", "127.0.0.1");
@@ skipping 4995 matching lines @@
 
   // 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";
     load_observer.Wait();
   }
 
-  // The last successful url shouldn't be the blocked url.
-  EXPECT_EQ(old_subframe_url,
-            root->child_at(0)->current_frame_host()->last_successful_url());
+  // The blocked frame should stay at the old location.
+  EXPECT_EQ(old_subframe_url, root->child_at(0)->current_url());
 
-  if (IsBrowserSideNavigationEnabled()) {
-    // The blocked frame should go to an error page. Errors currently commit
-    // with the URL of the blocked page.
-    EXPECT_EQ(blocked_url, root->child_at(0)->current_url());
-
-    // The page should get the title of an error page (i.e "") and not the
-    // title of the blocked page.
-    std::string frame_title;
-    EXPECT_TRUE(ExecuteScriptAndExtractString(
-        root->child_at(0), "domAutomationController.send(document.title)",
-        &frame_title));
-    EXPECT_EQ("", frame_title);
-  } else {
-    // 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));
-    EXPECT_EQ("Title Of Awesomeness", frame_title);
-  }
+  // 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));
+  EXPECT_EQ("Title Of Awesomeness", frame_title);
 
   // Navigate to a URL without CSP.
   EXPECT_TRUE(NavigateToURL(
       shell(), embedded_test_server()->GetURL("a.com", "/title1.html")));
 
   // Verify that the frame's CSP got correctly reset to an empty set.
   EXPECT_EQ(0u,
             root->current_replication_state().accumulated_csp_headers.size());
 }
 
@@ skipping 46 matching lines @@
 
   // 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";
     load_observer2.Wait();
   }
 
-  // The last successful url shouldn't be the blocked url.
-  EXPECT_EQ(old_subframe_url,
-            root->child_at(0)->current_frame_host()->last_successful_url());
+  // The blocked frame should stay at the old location.
+  EXPECT_EQ(old_subframe_url, root->child_at(0)->current_url());
 
-  if (IsBrowserSideNavigationEnabled()) {
-    // The blocked frame should go to an error page. Errors currently commit
-    // with the URL of the blocked page.
-    EXPECT_EQ(blocked_url, root->child_at(0)->current_url());
-
-    // The page should get the title of an error page (i.e "") and not the
-    // title of the blocked page.
-    std::string frame_title;
-    EXPECT_TRUE(ExecuteScriptAndExtractString(
-        root->child_at(0), "domAutomationController.send(document.title)",
-        &frame_title));
-    EXPECT_EQ("", frame_title);
-  } else {
-    // 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));
-    EXPECT_EQ("Title Of Awesomeness", frame_title);
-  }
+  // 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));
+  EXPECT_EQ("Title Of Awesomeness", frame_title);
 }
 
 // Test that a cross-origin frame's navigation can be blocked by CSP frame-src.
 // In this version of a test, CSP is inherited by srcdoc iframe from a parent
 // that declared CSP via HTTP headers.  Cross-origin frame navigating to a
 // blocked location is a child of the srcdoc iframe.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                        CrossSiteIframeBlockedByCSPInheritedBySrcDocParent) {
   GURL main_url(
       embedded_test_server()->GetURL("a.com", "/frame-src-self-and-b.html"));
@@ skipping 40 matching lines @@
 
   // 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";
     load_observer2.Wait();
   }
 
-  // The last successful url shouldn't be the blocked url.
-  EXPECT_EQ(old_subframe_url,
-            navigating_frame->current_frame_host()->last_successful_url());
+  // The blocked frame should stay at the old location.
+  EXPECT_EQ(old_subframe_url, navigating_frame->current_url());
 
-  if (IsBrowserSideNavigationEnabled()) {
-    // The blocked frame should go to an error page. Errors currently commit
-    // with the URL of the blocked page.
-    EXPECT_EQ(blocked_url, navigating_frame->current_url());
-
-    // The page should get the title of an error page (i.e "") and not the
-    // title of the blocked page.
-    std::string frame_title;
-    EXPECT_TRUE(ExecuteScriptAndExtractString(
-        navigating_frame, "domAutomationController.send(document.title)",
-        &frame_title));
-    EXPECT_EQ("", frame_title);
-  } else {
-    // 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)",
-        &frame_title));
-    EXPECT_EQ("Title Of Awesomeness", frame_title);
-  }
+  // The blocked frame should keep the old title.
+  std::string frame_title;
+  EXPECT_TRUE(ExecuteScriptAndExtractString(
+      navigating_frame, "domAutomationController.send(document.title)",
+      &frame_title));
+  EXPECT_EQ("Title Of Awesomeness", frame_title);
 
   // Navigate the subframe to a URL without CSP.
   NavigateFrameToURL(srcdoc_frame,
                      embedded_test_server()->GetURL("a.com", "/title1.html"));
 
   // Verify that the frame's CSP got correctly reset to an empty set.
   EXPECT_EQ(
       0u,
       srcdoc_frame->current_replication_state().accumulated_csp_headers.size());
 }
@@ skipping 2251 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