Revert "Revert 249676 "Have the unload event execute in background on cr...""

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 4ff41aaff352a853267ebf922f57e1a01eb4b804..97305f3b5299e4fbc4e2daf6258806217bc67a38 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -243,7 +243,7 @@ void RenderFrameHostImpl::OnNavigate(const IPC::Message& msg) {
   // unload request.  It will either respond to the unload request soon or our
   // timer will expire.  Either way, we should ignore this message, because we
   // have already committed to closing this renderer.
-  if (render_view_host_->is_waiting_for_unload_ack_)
+  if (render_view_host_->IsWaitingForUnloadACK())
     return;
 
   RenderProcessHost* process = GetProcess();
@@ -331,6 +331,10 @@ void RenderFrameHostImpl::OnContextMenu(const ContextMenuParams& params) {
   delegate_->ShowContextMenu(this, validated_params);
 }
 
+void RenderFrameHostImpl::SetPendingShutdown(const base::Closure& on_swap_out) {
+  render_view_host_->SetPendingShutdown(on_swap_out);
+}
+
 bool RenderFrameHostImpl::CanCommitURL(const GURL& url) {
   // TODO(creis): We should also check for WebUI pages here.  Also, when the
   // out-of-process iframes implementation is ready, we should check for