Skip BeforeUnload on cross-site navigations when there are no handlers

content/browser/frame_host/render_frame_host_manager_unittest.cc

Index: content/browser/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index 34e48e549290692156bf5e63771a80fa643f28bf..65668ccb4df5a654ceeb34109cd743008e777144 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -1154,6 +1154,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateAfterMissingSwapOutACK) {
   contents()->NavigateAndCommit(kUrl2);
   TestRenderFrameHost* rfh2 = main_test_rfh();
   rfh2->GetSiteInstance()->increment_active_frame_count();
+  rfh2->SendBeforeUnloadHandlersPresent(true);
 
   // Now go back, but suppose the SwapOut_ACK isn't received.  This shouldn't
   // happen, but we have seen it when going back quickly across many entries
@@ -1794,6 +1795,9 @@ TEST_F(RenderFrameHostManagerTest,
   TestRenderFrameHost* rfh1 = main_test_rfh();
   EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state());
 
+  // Register a BeforeUnload handler.
+  rfh1->SendBeforeUnloadHandlersPresent(true);
+
   // Navigate to a new site, starting a cross-site navigation.
   controller().LoadURL(
       kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());