| 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 d03aa2f0ced989d8a4d6e5a364f9b10643d647d3..343ac435306bf70001893e538dca52e0139bdf56 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
|
| @@ -775,7 +775,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyReNavigation) {
|
| // The RVH is swapped out after receiving the unload ack.
|
| manager->SwapOutOldPage();
|
| EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
|
| - ViewMsg_SwapOut::ID));
|
| + FrameMsg_SwapOut::ID));
|
| test_host->OnSwappedOut(false);
|
|
|
| EXPECT_EQ(host, manager->current_frame_host());
|
| @@ -816,7 +816,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyReNavigation) {
|
| // RenderFrameHostManager::DidNavigateFrame is called.
|
| manager->SwapOutOldPage();
|
| EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
|
| - ViewMsg_SwapOut::ID));
|
| + FrameMsg_SwapOut::ID));
|
| test_host->OnSwappedOut(false);
|
|
|
| // Commit.
|
| @@ -1029,7 +1029,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateAfterMissingSwapOutACK) {
|
| EXPECT_TRUE(rvh2->is_waiting_for_beforeunload_ack());
|
| contents()->ProceedWithCrossSiteNavigation();
|
| EXPECT_FALSE(rvh2->is_waiting_for_beforeunload_ack());
|
| - rvh2->SwapOut();
|
| + static_cast<RenderFrameHostImpl*>(rvh2->GetMainFrame())->SwapOut();
|
| EXPECT_TRUE(rvh2->IsWaitingForUnloadACK());
|
|
|
| // The back navigation commits.
|
|
|