Always restart the hung page timer after a beforeunload dialog.

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 4195 matching lines @@
       static_cast<RenderFrameHostImpl*>(render_frame_host);
   if (delegate_)
     delegate_->WillRunBeforeUnloadConfirm();
 
   bool suppress_this_message =
       !rfhi->is_active() ||
       ShowingInterstitialPage() || !delegate_ ||
       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;
   }
 
   is_showing_before_unload_dialog_ = true;
   dialog_manager_ = delegate_->GetJavaScriptDialogManager(this);
   dialog_manager_->RunBeforeUnloadDialog(
       this, is_reload,
       base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this),
                  render_frame_host->GetProcess()->GetID(),
                  render_frame_host->GetRoutingID(), reply_msg,
@@ skipping 909 matching lines @@
     // meantime.  Do not reset the navigation state in that case.
     if (rfh && rfh == rfh->frame_tree_node()->current_frame_host()) {
       rfh->frame_tree_node()->BeforeUnloadCanceled();
       controller_.DiscardNonCommittedEntries();
     }
 
     for (auto& observer : observers_)
       observer.BeforeUnloadDialogCancelled();
   }
 
+  if (rfh) {
+    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;
-  if (rfh) {
-    rfh->JavaScriptDialogClosed(reply_msg, success, user_input,
-                                dialog_was_suppressed);
-  } else {
-    // Don't leak the sync IPC reply if the RFH or process is gone.
-    delete reply_msg;
-  }
 }
 
 void WebContentsImpl::SetEncoding(const std::string& encoding) {
   if (encoding == last_reported_encoding_)
     return;
   last_reported_encoding_ = encoding;
 
   canonical_encoding_ = base::GetCanonicalEncodingNameByAliasName(encoding);
 }
 
@@ skipping 267 matching lines @@
     RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host);
     if (!render_view_host)
       continue;
     render_view_host_set.insert(render_view_host);
   }
   for (RenderViewHost* render_view_host : render_view_host_set)
     render_view_host->OnWebkitPreferencesChanged();
 }
 
 }  // namespace content