Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/test/test_web_contents.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/test/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
@@ skipping 25 matching lines @@
   TestWebContents* test_web_contents = new TestWebContents(browser_context);
   test_web_contents->Init(WebContents::CreateParams(browser_context, instance));
   return test_web_contents;
 }
 
 TestWebContents::~TestWebContents() {
   EXPECT_FALSE(expect_set_history_length_and_prune_);
 }
 
 RenderViewHost* TestWebContents::GetPendingRenderViewHost() const {
-  return GetRenderManager()->pending_render_view_host_;
+  return GetRenderManager()->pending_render_view_host();
 }
 
 TestRenderViewHost* TestWebContents::pending_test_rvh() const {
   return static_cast<TestRenderViewHost*>(GetPendingRenderViewHost());
 }
 
 void TestWebContents::TestDidNavigate(RenderViewHost* render_view_host,
                                       int page_id,
                                       const GURL& url,
                                       PageTransition transition) {
@@ skipping 185 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_pos) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content