Refactor sudden termination

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5b891f5487de5e086e1618da88c14d677e59a059..e93737f8292d34be976562bed748dc685b3f7a96 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1101,8 +1101,8 @@ bool WebContentsImpl::NeedToFireBeforeUnload() {
   // TODO(creis): Should we fire even for interstitial pages?
   return WillNotifyDisconnection() &&
       !ShowingInterstitialPage() &&
-      !static_cast<RenderViewHostImpl*>(
-          GetRenderViewHost())->SuddenTerminationAllowed();
+      !static_cast<RenderFrameHostImpl*>(

[Charlie Reis, 2015/01/23 06:01:32]

We shouldn't need this cast.  Just return RenderFrameHostImpl from
WebContentsImpl::GetMainFrame (will work with covariant return types).

[clamy, 2015/01/26 16:38:40]

WebContentsImpl::GetMainFrame returns a RenderFrameHost and is an implementation
of WebContents::GetMainFrame which is part of the public content API. I don't
think I can modify it to return a RenderFrameHostImpl (or am I not understanding
this comment?).

[Charlie Reis, 2015/01/29 23:20:40]

You can make WebContentsImpl::GetMainFrame return RenderFrameHostImpl.  That
still matches the contract from WebContents::GetMainFrame, because all
RenderFrameHostImpls are RenderFrameHosts.  See
WebContentsImpl::GetSiteInstance() for a similar example.

+          GetMainFrame())->SuddenTerminationAllowed();
 }
 
 void WebContentsImpl::DispatchBeforeUnload(bool for_cross_site_transition) {
@@ -4025,7 +4025,7 @@ void WebContentsImpl::RendererUnresponsive(RenderViewHost* render_view_host) {
       rfhi->IsWaitingForUnloadACK()) {
     // Hang occurred while firing the beforeunload/unload handler.
     // Pretend the handler fired so tab closing continues as if it had.
-    rvhi->set_sudden_termination_allowed(true);
+    rfhi->set_override_sudden_termination_status(true);
 
     if (!GetRenderManager()->ShouldCloseTabOnUnresponsiveRenderer())
       return;