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

content/public/test/test_renderer_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_renderer_host.h"
 
 #include "base/run_loop.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 94 matching lines @@
 RenderViewHost* RenderViewHostTestHarness::pending_rvh() {
   return static_cast<TestWebContents*>(web_contents())->
       GetRenderManagerForTesting()->pending_render_view_host();
 }
 
 RenderViewHost* RenderViewHostTestHarness::active_rvh() {
   return pending_rvh() ? pending_rvh() : rvh();
 }
 
 RenderFrameHost* RenderViewHostTestHarness::main_rfh() {
-  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      this->web_contents());
-  return web_contents->GetFrameTree()->GetMainFrame();
+  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();
 }
 
 BrowserContext* RenderViewHostTestHarness::browser_context() {
   return browser_context_.get();
 }
 
 MockRenderProcessHost* RenderViewHostTestHarness::process() {
   return static_cast<MockRenderProcessHost*>(active_rvh()->GetProcess());
 }
 
@@ skipping 96 matching lines @@
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
     rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content