Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/test/test_render_view_host.cc

Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index f33b0123bfd876fe14de4bc3cfa8893392059367..b71af6874dc016c3170d2abbfe9d1b01a0c4eb16 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -238,14 +238,12 @@ gfx::NativeViewId TestRenderWidgetHostView::GetParentForWindowlessPlugin()
 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,
@@ -256,7 +254,8 @@ TestRenderViewHost::TestRenderViewHost(
       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.