content/browser/frame_host/render_frame_host_manager_unittest.cc - Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file

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_unittest.cc

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase+ Created 4 years, 4 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

« content/browser/frame_host/navigation_controller_impl.cc ('K') | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc » ('j') | content/public/browser/navigation_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 383fba8df8657becfabd8a281ca19a7230260b89..f1924e27d6ca3e24c6aee5cc669b3c50d703797d 100644

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

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

@@ -434,7 +434,7 @@ class RenderFrameHostManagerTest : public RenderViewHostImplTestHarness {

->navigator()

->GetController());

FrameMsg_Navigate_Type::Value navigate_type =

- entry.restore_type() == NavigationEntryImpl::RESTORE_NONE

+ entry.restore_type() == RestoreType::NONE

? FrameMsg_Navigate_Type::NORMAL

: FrameMsg_Navigate_Type::RESTORE;

std::unique_ptr<NavigationRequest> navigation_request =

@@ -2536,8 +2536,7 @@ TEST_F(RenderFrameHostManagerTest, RestoreNavigationToWebUI) {

browser_context());

new_entry->SetPageID(0);

entries.push_back(std::move(new_entry));

- controller.Restore(

- 0, NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY, &entries);

+ controller.Restore(0, RestoreType::LAST_SESSION_EXITED_CLEANLY, &entries);

ASSERT_EQ(0u, entries.size());

ASSERT_EQ(1, controller.GetEntryCount());

@@ -2551,8 +2550,7 @@ TEST_F(RenderFrameHostManagerTest, RestoreNavigationToWebUI) {

Referrer(), base::string16() /* title */,

ui::PAGE_TRANSITION_RELOAD,

false /* is_renderer_init */);

- entry.set_restore_type(

- NavigationEntryImpl::RESTORE_LAST_SESSION_EXITED_CLEANLY);

+ entry.set_restore_type(RestoreType::LAST_SESSION_EXITED_CLEANLY);

NavigateToEntry(manager, entry);

// As the initial renderer was not live, the new RenderFrameHost should be