content/browser/frame_host/render_frame_host_manager_browsertest.cc - Issue 1851253002: Remove RFHM::IsPendingDeletion

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Latest fixes. 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

« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/frame_host/render_frame_host_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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()));