Fix DevToolsBeforeUnloadTest and BrowserCloseManagerBrowserTest.

chrome/browser/lifetime/browser_close_manager_browsertest.cc

 // 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.
 
 #include "chrome/browser/lifetime/browser_close_manager.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 27 matching lines @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/app_modal/javascript_app_modal_dialog.h"
 #include "components/app_modal/native_app_modal_dialog.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/sessions/core/tab_restore_service_observer.h"
 #include "content/public/browser/browser_context.h"
 #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"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/download_test_observer.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/test/url_request/url_request_slow_download_job.h"
 
@@ skipping 226 matching lines @@
     ui_test_utils::NavigateToURLWithDisposition(
         browser, GURL(net::URLRequestSlowDownloadJob::kKnownSizeUrl),
         WindowOpenDisposition::NEW_BACKGROUND_TAB,
         ui_test_utils::BROWSER_TEST_NONE);
     observer.WaitForFinished();
     EXPECT_EQ(
         1UL,
         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) {
     for (int i = 0; i < browser->tab_strip_model()->count(); i++)
       DisableHangMonitor(browser->tab_strip_model()->GetWebContentsAt(i));
   }
 
   std::vector<Browser*> browsers_;
 };
 
@@ skipping 981 matching lines @@
 
   chrome::CloseAllBrowsers();
   EXPECT_FALSE(browser_shutdown::IsTryingToQuit());
   EXPECT_TRUE(BrowserList::GetInstance()->empty());
   EXPECT_TRUE(IsBackgroundModeSuspended());
 }
 
 INSTANTIATE_TEST_CASE_P(BrowserCloseManagerWithBackgroundModeBrowserTest,
                         BrowserCloseManagerWithBackgroundModeBrowserTest,
                         testing::Bool());