Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/test/test_render_view_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/test/test_render_view_host.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 220 matching lines @@
 
 gfx::NativeViewId TestRenderWidgetHostView::GetParentForWindowlessPlugin()
     const {
   return 0;
 }
 #endif
 
 TestRenderViewHost::TestRenderViewHost(
     SiteInstance* instance,
     RenderViewHostDelegate* delegate,
-    RenderFrameHostDelegate* frame_delegate,
     RenderWidgetHostDelegate* widget_delegate,
     int routing_id,
     int main_frame_routing_id,
     bool swapped_out)
     : RenderViewHostImpl(instance,
                          delegate,
-                         frame_delegate,
                          widget_delegate,
                          routing_id,
                          main_frame_routing_id,
                          swapped_out,
                          false /* hidden */),
       render_view_created_(false),
       delete_counter_(NULL),
       simulate_fetch_via_proxy_(false),
       simulate_history_list_was_cleared_(false),
       contents_mime_type_("text/html"),
-      opener_route_id_(MSG_ROUTING_NONE) {
+      opener_route_id_(MSG_ROUTING_NONE),
+      main_render_frame_host_(NULL) {
   // TestRenderWidgetHostView installs itself into this->view_ in its
   // constructor, and deletes itself when TestRenderWidgetHostView::Destroy() is
   // called.
   new TestRenderWidgetHostView(this);
 
   main_frame_id_ = kFrameId;
 }
 
 TestRenderViewHost::~TestRenderViewHost() {
   if (delete_counter_)
@@ skipping 168 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return static_cast<TestRenderFrameHost*>(main_rfh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content