Revert of Keep track in the browser of which frames have onunload and onbeforeunload handlers.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index abe32fab1fbd1dbf27fb38fed4757edba48210fa..260b7da66bc036c94f40882800a84f7a8d40f3e1 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -378,8 +378,6 @@ RenderFrameHostImpl::RenderFrameHostImpl(SiteInstance* site_instance,
       is_waiting_for_swapout_ack_(false),
       render_frame_created_(false),
       navigations_suspended_(false),
-      has_beforeunload_handlers_(false),
-      has_unload_handlers_(false),
       is_waiting_for_beforeunload_ack_(false),
       unload_ack_is_for_navigation_(false),
       is_loading_(false),
@@ -754,10 +752,6 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
     IPC_MESSAGE_HANDLER(FrameHostMsg_DocumentOnLoadCompleted,
                         OnDocumentOnLoadCompleted)
     IPC_MESSAGE_HANDLER(FrameHostMsg_BeforeUnload_ACK, OnBeforeUnloadACK)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_BeforeUnloadHandlersPresent,
-                        OnBeforeUnloadHandlersPresent)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_UnloadHandlersPresent,
-                        OnUnloadHandlersPresent)
     IPC_MESSAGE_HANDLER(FrameHostMsg_SwapOut_ACK, OnSwapOutACK)
     IPC_MESSAGE_HANDLER(FrameHostMsg_ContextMenu, OnContextMenu)
     IPC_MESSAGE_HANDLER(FrameHostMsg_JavaScriptExecuteResponse,
@@ -2397,14 +2391,6 @@ void RenderFrameHostImpl::OnSetHasReceivedUserGesture() {
   frame_tree_node_->OnSetHasReceivedUserGesture();
 }
 
-void RenderFrameHostImpl::OnBeforeUnloadHandlersPresent(bool present) {
-  has_beforeunload_handlers_ = present;
-}
-
-void RenderFrameHostImpl::OnUnloadHandlersPresent(bool present) {
-  has_unload_handlers_ = present;
-}
-
 #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
 void RenderFrameHostImpl::OnShowPopup(
     const FrameHostMsg_ShowPopup_Params& params) {
@@ -2736,25 +2722,7 @@ void RenderFrameHostImpl::SimulateBeforeUnloadAck() {
 }
 
 bool RenderFrameHostImpl::ShouldDispatchBeforeUnload() {
-  if (!IsRenderFrameLive())
-    return false;
-
-  for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) {
-    if (node->current_frame_host()->has_beforeunload_handlers_)
-      return true;
-  }
-  return false;
-}
-
-bool RenderFrameHostImpl::ShouldDispatchUnload() {
-  if (!IsRenderFrameLive())
-    return false;
-
-  for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) {
-    if (node->current_frame_host()->has_unload_handlers_)
-      return true;
-  }
-  return false;
+  return IsRenderFrameLive();
 }
 
 void RenderFrameHostImpl::UpdateOpener() {