Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc |
index 53011d8839f50f16eb98ca99818b1b270ffeb471..ff41b493cb8e5997252350da67da80d64a792535 100644 |
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc |
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc |
@@ -2397,7 +2397,8 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, |
// The previous RFH should still be pending deletion, as we wait for either |
// the SwapOut ACK or a timeout. |
- ASSERT_TRUE(root->render_manager()->IsPendingDeletion(rfh_a)); |
+ ASSERT_TRUE(rfh_a->IsRenderFrameLive()); |
+ ASSERT_TRUE(!rfh_a->IsRFHStateActive(rfh_a->rfh_state())); |
alexmos
2016/04/06 00:26:33
nit: ASSERT_FALSE might be a bit more readable, he
|
// The corresponding RVH should not be pending deletion due to the proxy. |
EXPECT_FALSE(root->render_manager()->IsViewPendingDeletion( |
@@ -2454,7 +2455,8 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, |
// The previous RFH and RVH should still be pending deletion, as we wait for |
// either the SwapOut ACK or a timeout. |
- ASSERT_TRUE(root->render_manager()->IsPendingDeletion(rfh_a)); |
+ ASSERT_TRUE(rfh_a->IsRenderFrameLive()); |
+ ASSERT_TRUE(!rfh_a->IsRFHStateActive(rfh_a->rfh_state())); |
EXPECT_TRUE(root->render_manager()->IsViewPendingDeletion( |
rfh_a->render_view_host())); |