| 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 e058562321803384620492f16726b474e1baad42..f1b66f6ebb6b8dcc80c2b8cf6cedb55519ead8aa 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(), true));
|
| CHECK(frame_host);
|
| frame_host->set_pending_commit(true);
|
| return frame_host;
|
| @@ -2881,7 +2881,8 @@ 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(), true));
|
|
|
| // There should be a pending WebUI set to reuse the current one.
|
| EXPECT_EQ(web_ui, host->web_ui());
|
| @@ -2937,7 +2938,8 @@ 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(), true));
|
|
|
| EXPECT_EQ(web_ui, manager->GetNavigatingWebUI());
|
| EXPECT_EQ(web_ui, host->web_ui());
|
| @@ -3001,7 +3003,7 @@ TEST_F(RenderFrameHostManagerTestWithBrowserSideNavigation,
|
|
|
| // Prepare to commit, update the navigating RenderFrameHost.
|
| EXPECT_EQ(speculative_host,
|
| - manager->GetFrameHostForNavigation(*navigation_request));
|
| + manager->GetFrameHostForNavigation(navigation_request.get(), true));
|
|
|
| EXPECT_TRUE(manager->current_frame_host()->web_ui());
|
| EXPECT_FALSE(manager->current_frame_host()->pending_web_ui());
|
|
|