Remove UnfreezableFrameMsg_DeleteProxy.

Move UnfreezableFrameMsg_DeleteProxy to be a method on the
RemoteFrame. This is possible because associated channel messages
are not currently frozen.

BUG=993189

Change-Id: I9b09706686d4dc1b6bf7f499f1f5f90224380c39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527517
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841565}

content/browser/renderer_host/render_frame_proxy_host.cc

@@ -166,7 +166,7 @@ RenderFrameProxyHost::~RenderFrameProxyHost() {
     // This can be removed once we don't have a swapped out state on
     // RenderFrame. See https://crbug.com/357747
     if (!frame_tree_node_->IsMainFrame())
-      Send(new UnfreezableFrameMsg_DeleteProxy(routing_id_));
+      GetAssociatedRemoteFrame()->DetachAndDispose();
   }
 
   // TODO(arthursonzogni): There are no known reason for removing the

content/common/unfreezable_frame_messages.h

@@ -23,8 +23,4 @@
 // Instructs the renderer to delete the RenderFrame.
 IPC_MESSAGE_ROUTED1(UnfreezableFrameMsg_Delete, content::FrameDeleteIntention)
 
-// Requests the corresponding RenderFrameProxy to be deleted and removed from
-// the frame tree.
-IPC_MESSAGE_ROUTED0(UnfreezableFrameMsg_DeleteProxy)
-
 #endif  // CONTENT_COMMON_UNFREEZABLE_FRAME_MESSAGES_H_

content/public/test/fake_remote_frame.cc

@@ -93,4 +93,6 @@ void FakeRemoteFrame::FakeRemoteFrame::BindFrameHostReceiver(
       std::move(handle)));
 }
 
+void FakeRemoteFrame::DetachAndDispose() {}
+
 }  // namespace content

content/public/test/fake_remote_frame.h

@@ -87,6 +87,7 @@ class FakeRemoteFrame : public blink::mojom::RemoteFrame {
   void DidUpdateFramePolicy(const blink::FramePolicy& frame_policy) override {}
   void UpdateOpener(const base::Optional<base::UnguessableToken>&
                         opener_frame_token) override;
+  void DetachAndDispose() override;
 
  private:
   void BindFrameHostReceiver(mojo::ScopedInterfaceEndpointHandle handle);

content/renderer/render_frame_proxy.cc

@@ -409,14 +409,7 @@ std::string RenderFrameProxy::unique_name() const {
 }
 
 bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg)
-    IPC_MESSAGE_HANDLER(UnfreezableFrameMsg_DeleteProxy, OnDeleteProxy)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-
-  // Note: If |handled| is true, |this| may have been deleted.
-  return handled;
+  return false;
 }
 
 void RenderFrameProxy::OnAssociatedInterfaceRequest(
@@ -437,11 +430,6 @@ bool RenderFrameProxy::Send(IPC::Message* message) {
   return agent_scheduling_group_.Send(message);
 }
 
-void RenderFrameProxy::OnDeleteProxy() {
-  DCHECK(web_frame_);
-  web_frame_->Detach();
-}
-
 void RenderFrameProxy::ChildProcessGone() {
   crashed_ = true;
   compositing_helper_->ChildFrameGone(local_frame_size(),

content/renderer/render_frame_proxy.h

@@ -216,12 +216,6 @@ class CONTENT_EXPORT RenderFrameProxy : public IPC::Listener,
 
   mojom::RenderFrameProxyHost* GetFrameProxyHost();
 
-  // IPC handlers
-  void OnDeleteProxy();
-  void OnCompositorFrameSwapped(const IPC::Message& message);
-  void OnEnforceInsecureRequestPolicy(
-      blink::mojom::InsecureRequestPolicy policy);
-
   // mojom::RenderFrameProxy implementation:
   void EnableAutoResize(const gfx::Size& min_size,
                         const gfx::Size& max_size) override;
@@ -246,10 +240,6 @@ class CONTENT_EXPORT RenderFrameProxy : public IPC::Listener,
   // The routing ID by which this RenderFrameProxy is known.
   const int routing_id_;
 
-  // The routing ID of the provisional RenderFrame (if any) that is meant to
-  // replace this RenderFrameProxy in the frame tree.
-  int provisional_frame_routing_id_;
-
   // Stores the WebRemoteFrame we are associated with.
   blink::WebRemoteFrame* web_frame_ = nullptr;
 

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

@@ -915,6 +915,11 @@ interface RemoteFrame {
   // Requests that the blink::RemoteFrame updates its opener to the specified
   // frame. The frame token may be "empty" if the opener was disowned.
   UpdateOpener(mojo_base.mojom.UnguessableToken? opener_frame_token);
+
+  // Requests the corresponding RemoteFrame to be deleted and removed from
+  // the frame tree. This should not be called on the main frame as that frame
+  // is owned by the associated WebView.
+  DetachAndDispose();
 };
 
 // Implemented in Blink, this interface defines main-frame-specific methods that

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

@@ -143,6 +143,11 @@ RemoteFrame::~RemoteFrame() {
   DCHECK(!view_);
 }
 
+void RemoteFrame::DetachAndDispose() {
+  DCHECK(!IsMainFrame());
+  Detach(FrameDetachType::kRemove);
+}
+
 void RemoteFrame::Trace(Visitor* visitor) const {
   visitor->Trace(view_);
   visitor->Trace(security_context_);

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

@@ -167,6 +167,7 @@ class CORE_EXPORT RemoteFrame final : public Frame,
   void DidUpdateFramePolicy(const FramePolicy& frame_policy) override;
   void UpdateOpener(const base::Optional<base::UnguessableToken>&
                         opener_frame_token) override;
+  void DetachAndDispose() override;
 
   // Called only when this frame has a local frame owner.
   IntSize GetMainFrameViewportSize() const override;