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 de19b320d9c154a2979cabc98a90ef50a59692fa..11c868dc4d0115700de323ae92c4ad04e854df5e 100644 |
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc |
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc |
@@ -1264,7 +1264,9 @@ |
// happen, but we have seen it when going back quickly across many entries |
// (http://crbug.com/93427). |
contents()->GetController().GoBack(); |
+ EXPECT_TRUE(rfh2->is_waiting_for_beforeunload_ack()); |
contents()->GetMainFrame()->PrepareForCommit(); |
+ EXPECT_FALSE(rfh2->is_waiting_for_beforeunload_ack()); |
// The back navigation commits. |
const NavigationEntry* entry1 = contents()->GetController().GetPendingEntry(); |
@@ -1882,7 +1884,6 @@ |
contents()->NavigateAndCommit(kUrl1); |
TestRenderFrameHost* rfh1 = main_test_rfh(); |
EXPECT_TRUE(rfh1->is_active()); |
- rfh1->set_has_beforeunload_handlers(); |
// Navigate to a new site, starting a cross-site navigation. |
controller().LoadURL( |