Revert of Revert of [site isolation] cross-site transfers should track the RenderFrameHost

content/browser/frame_host/render_frame_host_manager_unittest.cc

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 1a76c36d7c2a5e52d7b4df37ffbd402b8a628183..e8db0e1eabc065a18bdb3e2c020cb73422512ad3 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -925,7 +925,7 @@
 
   // Check that the navigation is still suspended because the old RVH
   // is not swapped out, yet.
-  EXPECT_TRUE(host2->render_view_host()->are_navigations_suspended());
+  EXPECT_TRUE(host2->are_navigations_suspended());
   MockRenderProcessHost* test_process_host2 =
       static_cast<MockRenderProcessHost*>(host2->GetProcess());
   test_process_host2->sink().ClearMessages();
@@ -976,8 +976,7 @@
   EXPECT_NE(host3->GetProcess()->GetID(), host2_process_id);
 
   // Navigations in the new RVH should be suspended.
-  EXPECT_TRUE(static_cast<RenderViewHostImpl*>(
-      host3->render_view_host())->are_navigations_suspended());
+  EXPECT_TRUE(host3->are_navigations_suspended());
   EXPECT_EQ(host, manager->current_frame_host());
   EXPECT_FALSE(manager->current_frame_host()->is_swapped_out());
 
@@ -1048,10 +1047,10 @@
   // Pending rvh2 is already deleted.
   contents()->ProceedWithCrossSiteNavigation();
 
-  TestRenderViewHost* rvh3 = pending_test_rvh();
-  EXPECT_TRUE(rvh3);
+  TestRenderFrameHost* rfh3 = pending_main_test_rfh();
+  EXPECT_TRUE(rfh3);
   // Navigation should be already unblocked by rvh1.
-  EXPECT_FALSE(rvh3->are_navigations_suspended());
+  EXPECT_FALSE(rfh3->are_navigations_suspended());
 }
 
 // Tests WebUI creation.