Move RenderViewHost swap out state to RenderFrameHost.

content/test/test_web_contents.cc

Index: content/test/test_web_contents.cc
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index fdc3918b14ab4453ebe5165eba62d72821f8ad6e..f2ee15df13eecf5912deb8d52ad108142ab3f11c 100644
--- a/content/test/test_web_contents.cc
+++ b/content/test/test_web_contents.cc
@@ -161,13 +161,13 @@ void TestWebContents::CommitPendingNavigation() {
   // Simulate the SwapOut_ACK. This is needed when cross-site navigation happens
   // (old_rfh != rfh).
   if (old_rfh != rfh)
-    old_rfh->OnSwappedOut(false);
+    old_rfh->OnSwappedOut();
 }
 
 void TestWebContents::ProceedWithCrossSiteNavigation() {
   if (!GetPendingMainFrame())
     return;
-  GetMainFrame()->GetRenderViewHost()->SendBeforeUnloadACK(true);
+  GetMainFrame()->SendBeforeUnloadACK(true);
 }
 
 RenderViewHostDelegateView* TestWebContents::GetDelegateView() {