Index: content/browser/frame_host/navigator_impl.cc |
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc |
index ad1a19a5eb33de3be38b9eb3335cf595e60c6f51..87f6590bb83c544ddb401622c92b530c1db02557 100644 |
--- a/content/browser/frame_host/navigator_impl.cc |
+++ b/content/browser/frame_host/navigator_impl.cc |
@@ -231,8 +231,7 @@ |
validated_url, validated_redirect_chain, |
render_frame_host->frame_tree_node(), is_renderer_initiated, |
false, // is_same_page |
- navigation_start, pending_nav_entry_id, started_from_context_menu, |
- CSPDisposition::CHECK)); // should_check_main_world_csp |
+ navigation_start, pending_nav_entry_id, started_from_context_menu)); |
} |
void NavigatorImpl::DidFailProvisionalLoadWithError( |
@@ -613,8 +612,7 @@ |
// Navigating to a new location means a new, fresh set of http headers and/or |
// <meta> elements - we need to reset CSP and Feature Policy. |
if (!is_navigation_within_page) { |
- render_frame_host->ResetContentSecurityPolicies(); |
- render_frame_host->frame_tree_node()->ResetCspHeaders(); |
+ render_frame_host->frame_tree_node()->ResetContentSecurityPolicy(); |
render_frame_host->frame_tree_node()->ResetFeaturePolicyHeader(); |
} |
@@ -673,7 +671,7 @@ |
// stay correct even if the render_frame_host later becomes pending deletion. |
// The URL is set regardless of whether it's for a net error or not. |
render_frame_host->frame_tree_node()->SetCurrentURL(params.url); |
- render_frame_host->SetLastCommittedOrigin(params.origin); |
+ render_frame_host->set_last_committed_origin(params.origin); |
// Separately, update the frame's last successful URL except for net error |
// pages, since those do not end up in the correct process after transfers |