Move FrameMsg_ResetContentSecurityPolicy to mojo

Move FrameMsg_ResetContentSecurityPolicy to a RemoteFrame mojo
interface.

BUG=1008432

Change-Id: I8b96015cefc57e297594ac6d2ebc4024ffd698e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1873400
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709069}

content/browser/frame_host/render_frame_host_manager.cc

@@ -930,8 +930,8 @@ void RenderFrameHostManager::OnDidAddContentSecurityPolicies(
 
 void RenderFrameHostManager::OnDidResetContentSecurityPolicy() {
   for (const auto& pair : proxy_hosts_) {
-    pair.second->Send(
-        new FrameMsg_ResetContentSecurityPolicy(pair.second->GetRoutingID()));
+    pair.second->GetAssociatedRemoteFrame()
+        ->ResetReplicatedContentSecurityPolicy();
   }
 }
 

content/common/frame_messages.h

@@ -781,9 +781,6 @@ IPC_MESSAGE_ROUTED2(FrameMsg_DidUpdateName,
 IPC_MESSAGE_ROUTED1(FrameMsg_AddContentSecurityPolicies,
                     std::vector<content::ContentSecurityPolicyHeader>)
 
-// Resets ContentSecurityPolicy in a frame proxy / in RemoteSecurityContext.
-IPC_MESSAGE_ROUTED0(FrameMsg_ResetContentSecurityPolicy)
-
 // Update a proxy's replicated enforcement of insecure request policy.
 // Used when the frame's policy is changed in another process.
 IPC_MESSAGE_ROUTED1(FrameMsg_EnforceInsecureRequestPolicy,

content/renderer/render_frame_proxy.cc

@@ -412,8 +412,6 @@ bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName)
     IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicies,
                         OnAddContentSecurityPolicies)
-    IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy,
-                        OnResetContentSecurityPolicy)
     IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy,
                         OnEnforceInsecureRequestPolicy)
     IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureNavigationsSet,
@@ -532,10 +530,6 @@ void RenderFrameProxy::OnAddContentSecurityPolicies(
   }
 }
 
-void RenderFrameProxy::OnResetContentSecurityPolicy() {
-  web_frame_->ResetReplicatedContentSecurityPolicy();
-}
-
 void RenderFrameProxy::OnEnforceInsecureRequestPolicy(
     blink::WebInsecureRequestPolicy policy) {
   web_frame_->SetReplicatedInsecureRequestPolicy(policy);

content/renderer/render_frame_proxy.h

@@ -248,7 +248,6 @@ class CONTENT_EXPORT RenderFrameProxy : public IPC::Listener,
   void OnDidUpdateName(const std::string& name, const std::string& unique_name);
   void OnAddContentSecurityPolicies(
       const std::vector<ContentSecurityPolicyHeader>& header);
-  void OnResetContentSecurityPolicy();
   void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy);
   void OnEnforceInsecureNavigationsSet(const std::vector<uint32_t>& set);
   void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties);

third_party/blink/public/mojom/frame/frame.mojom

@@ -99,4 +99,9 @@ interface RemoteFrame {
   // part of ViewMsg_Resize, once the browser process has resized the tab for
   // fullscreen.
   WillEnterFullscreen();
+
+  // Resets the replicated ContentSecurityPolicy on the remote frame's
+  // SecurityContext. Used to reset CSP from the previous document on
+  // a cross-document navigation.
+  ResetReplicatedContentSecurityPolicy();
 };
\ No newline at end of file

third_party/blink/renderer/core/frame/remote_frame.cc

@@ -252,6 +252,10 @@ void RemoteFrame::WillEnterFullscreen() {
       Fullscreen::RequestType::kPrefixedForCrossProcessDescendant);
 }
 
+void RemoteFrame::ResetReplicatedContentSecurityPolicy() {
+  GetSecurityContext()->ResetReplicatedContentSecurityPolicy();
+}
+
 bool RemoteFrame::IsIgnoredForHitTest() const {
   HTMLFrameOwnerElement* owner = DeprecatedLocalOwner();
   if (!owner || !owner->GetLayoutObject())

third_party/blink/renderer/core/frame/remote_frame.h

@@ -75,6 +75,7 @@ class CORE_EXPORT RemoteFrame final : public Frame,
 
   // blink::mojom::LocalFrame overrides:
   void WillEnterFullscreen() override;
+  void ResetReplicatedContentSecurityPolicy() override;
 
  private:
   // Frame protected overrides: