content/browser/frame_host/navigator_impl_unittest.cc - Issue 1849343004: Remove RenderFrameHostImplState and convert it to boolean.

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/navigator_impl_unittest.cc

Issue 1849343004: Remove RenderFrameHostImplState and convert it to boolean. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing nits. 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/navigation_controller_impl_browsertest.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigator_impl_unittest.cc

diff --git a/content/browser/frame_host/navigator_impl_unittest.cc b/content/browser/frame_host/navigator_impl_unittest.cc

index 97ae80f6f43f347af0cba8730284f4092aef956a..a8ff15d9df56c491613f52582145e2ccec3ade24 100644

--- a/content/browser/frame_host/navigator_impl_unittest.cc

+++ b/content/browser/frame_host/navigator_impl_unittest.cc

@@ -151,7 +151,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

// Commit the navigation.

main_test_rfh()->SendNavigate(0, entry_id, true, kUrl);

- EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, main_test_rfh()->rfh_state());

+ EXPECT_TRUE(main_test_rfh()->is_active());

EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl),

main_test_rfh()->GetSiteInstance()->GetSiteURL());

EXPECT_EQ(kUrl, contents()->GetLastCommittedURL());

@@ -204,7 +204,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

// Commit the navigation.

main_test_rfh()->SendNavigate(1, 0, true, kUrl2);

- EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, main_test_rfh()->rfh_state());

+ EXPECT_TRUE(main_test_rfh()->is_active());

EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl2),

main_test_rfh()->GetSiteInstance()->GetSiteURL());

EXPECT_EQ(kUrl2, contents()->GetLastCommittedURL());

@@ -258,7 +258,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

// Commit the navigation.

main_test_rfh()->SendNavigate(1, 0, true, kUrl2);

- EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, main_test_rfh()->rfh_state());

+ EXPECT_TRUE(main_test_rfh()->is_active());

EXPECT_EQ(kUrl2, contents()->GetLastCommittedURL());

EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

EXPECT_FALSE(node->render_manager()->pending_frame_host());