Always restart the hung page timer after a beforeunload dialog.

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 307e3fc64903bfe5bd14401e86a16e665fcc792a..75d89046439a801a1aaa3ecf8f09cfc26c182a1e 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4213,7 +4213,7 @@ void WebContentsImpl::RunBeforeUnloadConfirm(
       delegate_->ShouldSuppressDialogs(this) ||
       !delegate_->GetJavaScriptDialogManager(this);
   if (suppress_this_message) {
-    rfhi->JavaScriptDialogClosed(reply_msg, true, base::string16(), true);
+    rfhi->JavaScriptDialogClosed(true, reply_msg, true, base::string16(), true);
     return;
   }
 
@@ -5143,15 +5143,16 @@ void WebContentsImpl::OnDialogClosed(int render_process_id,
       observer.BeforeUnloadDialogCancelled();
   }
 
-  is_showing_javascript_dialog_ = false;
-  is_showing_before_unload_dialog_ = false;
   if (rfh) {
-    rfh->JavaScriptDialogClosed(reply_msg, success, user_input,
-                                dialog_was_suppressed);
+    rfh->JavaScriptDialogClosed(is_showing_before_unload_dialog_, reply_msg,

[Charlie Reis, 2017/02/27 18:41:41]

I suppose we could have avoided passing this in as a parameter if RFH asked its
delegate for the value of is_showing_before_unload_dialog_.  I think we should
probably stick with your approach, though-- fewer dependencies in the delegate
interface, and less tricky in the suppress_this_message case of
RunBeforeUnloadConfirm above.

[Avi (use Gerrit), 2017/02/27 19:28:49]

Acknowledged.

+                                success, user_input, dialog_was_suppressed);
   } else {
     // Don't leak the sync IPC reply if the RFH or process is gone.
     delete reply_msg;
   }
+
+  is_showing_javascript_dialog_ = false;
+  is_showing_before_unload_dialog_ = false;
 }
 
 void WebContentsImpl::SetEncoding(const std::string& encoding) {