Fix DevToolsBeforeUnloadTest and BrowserCloseManagerBrowserTest.

chrome/browser/lifetime/browser_close_manager_browsertest.cc

Index: chrome/browser/lifetime/browser_close_manager_browsertest.cc
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 9500cc25c466aee834c260b7c02b88705ff393b7..baa0536681611249a0f16c0c5e102a292abe9f12 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -45,6 +45,7 @@
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
@@ -291,14 +292,12 @@ class BrowserCloseManagerBrowserTest
         observer.NumDownloadsSeenInState(content::DownloadItem::IN_PROGRESS));
   }
 
-  // Makes sure that hang monitor will not trigger RendererUnresponsive
-  // for that web content or browser. That must be called before close action
-  // when using |AcceptClose| or |CancelClose|, to ensure the timeout does not
-  // prevent the dialog from appearing. https://crbug.com/519646
+  // Makes sure that the beforeunload hang monitor will not trigger. That must
+  // be called before close action when using |AcceptClose| or |CancelClose|, to
+  // ensure the timeout does not prevent the dialog from appearing.
+  // https://crbug.com/519646
   void DisableHangMonitor(content::WebContents* web_contents) {
-    web_contents->GetRenderViewHost()
-        ->GetWidget()
-        ->DisableHangMonitorForTesting();
+    web_contents->GetMainFrame()->DisableBeforeUnloadHangMonitorForTesting();
   }
 
   void DisableHangMonitor(Browser* browser) {