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

content/public/test/test_renderer_host.cc

Index: content/public/test/test_renderer_host.cc
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index c9136b766f8648c62bf2fe0d7134df05acc1dfe7..70d7e6694a22c52766c259d7e23480e3a1070cdf 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -112,19 +112,9 @@
 }
 
 RenderFrameHost* RenderViewHostTestHarness::main_rfh() {
-  WebContentsImpl* web_contents =
-      static_cast<WebContentsImpl*>(this->web_contents());
-  RenderFrameHostManager* main_frame_render_manager =
-      web_contents->GetFrameTree()->root()->render_manager();
-  return main_frame_render_manager->current_frame_host();
-}
-
-RenderFrameHost* RenderViewHostTestHarness::pending_main_rfh() {
-  WebContentsImpl* web_contents =
-      static_cast<WebContentsImpl*>(this->web_contents());
-  RenderFrameHostManager* main_frame_render_manager =
-      web_contents->GetFrameTree()->root()->render_manager();
-  return main_frame_render_manager->pending_frame_host();
+  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
+      this->web_contents());
+  return web_contents->GetFrameTree()->GetMainFrame();
 }
 
 BrowserContext* RenderViewHostTestHarness::browser_context() {