Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Unified Diff: content/browser/frame_host/render_frame_host_manager_browsertest.cc

Issue 1851253002: Remove RFHM::IsPendingDeletion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..13b9ef6efb46c22cb707ae9f6f2d4d2b4ded51b1 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_FALSE(rfh_a->IsRFHStateActive(rfh_a->rfh_state()));
// 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_FALSE(rfh_a->IsRFHStateActive(rfh_a->rfh_state()));
EXPECT_TRUE(root->render_manager()->IsViewPendingDeletion(
rfh_a->render_view_host()));

Powered by Google App Engine
This is Rietveld 408576698