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

content/browser/frame_host/render_frame_host_manager_unittest.cc

 // Copyright 2013 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 "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
@@ skipping 907 matching lines @@
   RenderFrameHostImpl* host2 = manager->Navigate(entry2);
   int host2_process_id = host2->GetProcess()->GetID();
 
   // A new RenderFrameHost should be created.
   EXPECT_TRUE(manager->pending_frame_host());
   ASSERT_EQ(host2, manager->pending_frame_host());
   EXPECT_NE(host2, host);
 
   // Check that the navigation is still suspended because the old RVH
   // is not swapped out, yet.
-  EXPECT_TRUE(host2->are_navigations_suspended());
+  EXPECT_TRUE(host2->render_view_host()->are_navigations_suspended());
   MockRenderProcessHost* test_process_host2 =
       static_cast<MockRenderProcessHost*>(host2->GetProcess());
   test_process_host2->sink().ClearMessages();
   host2->render_view_host()->NavigateToURL(kUrl2);
   EXPECT_FALSE(test_process_host2->sink().GetUniqueMessageMatching(
       FrameMsg_Navigate::ID));
 
   // Allow closing the current Render View (precondition for swapping out
   // the RVH): Simulate response from RenderFrame for FrameMsg_BeforeUnload sent
   // by DispatchBeforeUnload.
@@ skipping 30 matching lines @@
   test_process_host->sink().ClearMessages();
   RenderFrameHostImpl* host3 = manager->Navigate(entry3);
 
   // A new RenderFrameHost should be created. host2 is now deleted.
   EXPECT_TRUE(manager->pending_frame_host());
   ASSERT_EQ(host3, manager->pending_frame_host());
   EXPECT_NE(host3, host);
   EXPECT_NE(host3->GetProcess()->GetID(), host2_process_id);
 
   // Navigations in the new RVH should be suspended.
-  EXPECT_TRUE(host3->are_navigations_suspended());
+  EXPECT_TRUE(static_cast<RenderViewHostImpl*>(
+      host3->render_view_host())->are_navigations_suspended());
   EXPECT_EQ(host, manager->current_frame_host());
   EXPECT_FALSE(manager->current_frame_host()->is_swapped_out());
 
   // Simulate a response to the second beforeunload request.
   EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
       FrameMsg_BeforeUnload::ID));
   test_host->SendBeforeUnloadACK(true);
 
   // CrossSiteResourceHandler::StartCrossSiteTransition triggers a
   // call of RenderFrameHostManager::SwapOutOldPage before
@@ skipping 50 matching lines @@
   TestRenderViewHost* rvh2 = pending_test_rvh();
   EXPECT_TRUE(rvh2);
   static_cast<SiteInstanceImpl*>(rvh2->GetSiteInstance())->
       increment_active_view_count();
 
   contents()->GetController().LoadURL(
       kUrl3, Referrer(), PAGE_TRANSITION_LINK, std::string());
   // Pending rvh2 is already deleted.
   contents()->ProceedWithCrossSiteNavigation();
 
-  TestRenderFrameHost* rfh3 = pending_main_test_rfh();
-  EXPECT_TRUE(rfh3);
+  TestRenderViewHost* rvh3 = pending_test_rvh();
+  EXPECT_TRUE(rvh3);
   // Navigation should be already unblocked by rvh1.
-  EXPECT_FALSE(rfh3->are_navigations_suspended());
+  EXPECT_FALSE(rvh3->are_navigations_suspended());
 }
 
 // Tests WebUI creation.
 TEST_F(RenderFrameHostManagerTest, WebUI) {
   set_should_create_webui(true);
   SiteInstance* instance = SiteInstance::Create(browser_context());
 
   scoped_ptr<TestWebContents> web_contents(
       TestWebContents::Create(browser_context(), instance));
   RenderFrameHostManager* manager = web_contents->GetRenderManagerForTesting();
@@ skipping 821 matching lines @@
       NavigationRequestForRenderFrameManager(
         main_test_rfh()->frame_tree_node()->render_manager());
   ASSERT_TRUE(main_request);
   EXPECT_EQ(kUrl3, main_request->info_for_testing().navigation_params.url);
   EXPECT_EQ(kUrl3, main_request->info_for_testing().first_party_for_cookies);
   EXPECT_TRUE(main_request->info_for_testing().is_main_frame);
   EXPECT_FALSE(main_request->info_for_testing().parent_is_main_frame);
 }
 
 }  // namespace content