Revert of Move beforeunload hang timer duties to its own timer.

content/browser/frame_host/render_frame_host_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 441 matching lines @@
   // selection. The lengths are supplied in code points, not in Java chars
   // (UTF-16 Code Unit) or in glyphs. Do nothing if there are one or more
   // invalid surrogate pairs in the requested range.
   void DeleteSurroundingTextInCodePoints(int before, int after);
 
   // Notifies the RenderFrame that the JavaScript message that was shown was
   // closed by the user.
   void JavaScriptDialogClosed(IPC::Message* reply_msg,
                               bool success,
                               const base::string16& user_input,
+                              bool is_before_unload_dialog,
                               bool dialog_was_suppressed);
 
   // Get the accessibility mode from the delegate and Send a message to the
   // renderer process to change the accessibility mode.
   void UpdateAccessibilityMode();
 
   // Samsung Galaxy Note-specific "smart clip" stylus text getter.
   void RequestSmartClipExtract(SmartClipCallback callback, gfx::Rect rect);
 
   // Request a one-time snapshot of the accessibility tree without changing
@@ skipping 409 matching lines @@
 
   void SendJavaScriptDialogReply(IPC::Message* reply_msg,
                                  bool success,
                                  const base::string16& user_input);
 
   // Returns ownership of the NavigationHandle associated with a navigation that
   // just committed.
   std::unique_ptr<NavigationHandleImpl> TakeNavigationHandleForCommit(
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
 
-  // Called by |beforeunload_timeout_| when the beforeunload timeout fires.
-  void BeforeUnloadTimeout();
-
   // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
   // refcount that calls Shutdown when it reaches zero.  This allows each
   // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring
   // we have a RenderViewHost for each RenderFrameHost.
   // TODO(creis): RenderViewHost will eventually go away and be replaced with
   // some form of page context.
   RenderViewHostImpl* const render_view_host_;
 
   RenderFrameHostDelegate* const delegate_;
 
@@ skipping 84 matching lines @@
   bool is_waiting_for_beforeunload_ack_;
 
   // Valid only when is_waiting_for_beforeunload_ack_ or
   // IsWaitingForUnloadACK is true.  This tells us if the unload request
   // is for closing the entire tab ( = false), or only this RenderFrameHost in
   // the case of a navigation ( = true). Currently only cross-site navigations
   // require a beforeUnload/unload ACK.
   // PlzNavigate: all navigations require a beforeUnload ACK.
   bool unload_ack_is_for_navigation_;
 
-  // The timeout monitor that runs from when the beforeunload is started in
-  // DispatchBeforeUnload() until either the render process ACKs it with an IPC
-  // to OnBeforeUnloadACK(), or until the timeout triggers.
-  std::unique_ptr<TimeoutMonitor> beforeunload_timeout_;
-
   // Indicates whether this RenderFrameHost is in the process of loading a
   // document or not.
   bool is_loading_;
 
   // PlzNavigate
   // Used to track whether a commit is expected in this frame. Only used in
   // tests.
   bool pending_commit_;
 
   // The unique ID of the latest NavigationEntry that this RenderFrameHost is
@@ skipping 133 matching lines @@
 
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_