Move RenderViewHost swap out state to RenderFrameHost.

chrome/test/base/browser_with_test_window_test.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 "chrome/test/base/browser_with_test_window_test.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 16 matching lines @@
 #if defined(USE_ASH)
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/ash_test_views_delegate.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/test/test_views_delegate.h"
 #endif
 
 using content::NavigationController;
+using content::RenderFrameHost;
+using content::RenderFrameHostTester;
 using content::RenderViewHost;
 using content::RenderViewHostTester;
 using content::WebContents;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : browser_type_(Browser::TYPE_TABBED),
       host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
       hosted_app_(false) {
 }
 
@@ skipping 81 matching lines @@
   CommitPendingLoad(&params.target_contents->GetController());
 }
 
 void BrowserWithTestWindowTest::CommitPendingLoad(
   NavigationController* controller) {
   if (!controller->GetPendingEntry())
     return;  // Nothing to commit.
 
   RenderViewHost* old_rvh =
       controller->GetWebContents()->GetRenderViewHost();
+  RenderFrameHost* old_rfh = old_rvh->GetMainFrame();
 
   RenderViewHost* pending_rvh = RenderViewHostTester::GetPendingForController(
       controller);
   if (pending_rvh) {
     // Simulate the BeforeUnload_ACK that is received from the current renderer
     // for a cross-site navigation.
     DCHECK_NE(old_rvh, pending_rvh);
-    RenderViewHostTester::For(old_rvh)->SendBeforeUnloadACK(true);
+    RenderFrameHostTester::For(old_rfh)->SendBeforeUnloadACK(true);
   }
   // Commit on the pending_rvh, if one exists.
   RenderViewHost* test_rvh = pending_rvh ? pending_rvh : old_rvh;
   RenderViewHostTester* test_rvh_tester = RenderViewHostTester::For(test_rvh);
 
   // Simulate a SwapOut_ACK before the navigation commits.
   if (pending_rvh)
-    RenderViewHostTester::For(old_rvh)->SimulateSwapOutACK();
+    RenderFrameHostTester::For(old_rfh)->SimulateSwapOutACK();
 
   // For new navigations, we need to send a larger page ID. For renavigations,
   // we need to send the preexisting page ID. We can tell these apart because
   // renavigations will have a pending_entry_index while new ones won't (they'll
   // just have a standalong pending_entry that isn't in the list already).
   if (controller->GetPendingEntryIndex() >= 0) {
     test_rvh_tester->SendNavigateWithTransition(
         controller->GetPendingEntry()->GetPageID(),
         controller->GetPendingEntry()->GetURL(),
         controller->GetPendingEntry()->GetTransitionType());
@@ skipping 81 matching lines @@
 
 #if !defined(OS_CHROMEOS) && defined(TOOLKIT_VIEWS)
 views::ViewsDelegate* BrowserWithTestWindowTest::CreateViewsDelegate() {
 #if defined(USE_ASH)
   return new ash::test::AshTestViewsDelegate;
 #else
   return new views::TestViewsDelegate;
 #endif
 }
 #endif