content/browser/frame_host/render_frame_host_manager_unittest.cc - Issue 2002633002: PlzNavigate: fix issue preventing navigations to WebUIs

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 2002633002: PlzNavigate: fix issue preventing navigations to WebUIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Now checking when ready to commit Created 4 years, 7 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_request.cc ('K') | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/webui/url_data_manager_backend.cc » ('j') | content/browser/webui/url_data_manager_backend.cc » ('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 306710c0b8853fedfe7516455aad9248504fbb70..a5164c779193c051cd24feff85236b3974978b0e 100644

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

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

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

// And also simulates the 2nd and final call to GetFrameHostForNavigation

// that determines the final frame that will commit the navigation.

TestRenderFrameHost* frame_host = static_cast<TestRenderFrameHost*>(

- manager->GetFrameHostForNavigation(*navigation_request));

+ manager->GetFrameHostForNavigation(navigation_request.get()));

CHECK(frame_host);

frame_host->set_pending_commit(true);

return frame_host;

@@ -2875,7 +2875,7 @@ TEST_F(RenderFrameHostManagerTestWithBrowserSideNavigation,

EXPECT_FALSE(GetPendingFrameHost(manager));

// Prepare to commit, update the navigating RenderFrameHost.

- EXPECT_EQ(host, manager->GetFrameHostForNavigation(*navigation_request));

+ EXPECT_EQ(host, manager->GetFrameHostForNavigation(navigation_request.get()));

// There should be a pending WebUI set to reuse the current one.

EXPECT_EQ(web_ui, host->web_ui());

@@ -2931,7 +2931,7 @@ TEST_F(RenderFrameHostManagerTestWithBrowserSideNavigation,

EXPECT_FALSE(GetPendingFrameHost(manager));

// Prepare to commit, update the navigating RenderFrameHost.

- EXPECT_EQ(host, manager->GetFrameHostForNavigation(*navigation_request));

+ EXPECT_EQ(host, manager->GetFrameHostForNavigation(navigation_request.get()));

EXPECT_EQ(web_ui, manager->GetNavigatingWebUI());

EXPECT_EQ(web_ui, host->web_ui());

@@ -2995,7 +2995,7 @@ TEST_F(RenderFrameHostManagerTestWithBrowserSideNavigation,

// Prepare to commit, update the navigating RenderFrameHost.

EXPECT_EQ(speculative_host,

- manager->GetFrameHostForNavigation(*navigation_request));

+ manager->GetFrameHostForNavigation(navigation_request.get()));

EXPECT_TRUE(manager->current_frame_host()->web_ui());

EXPECT_FALSE(manager->current_frame_host()->pending_web_ui());