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 5c13673b9f52bd53000d6afed75e0b750bafa45d..0754316f419f61ec70d8addb9a69c848c8c0425e 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -235,14 +235,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,
@@ -253,7 +251,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.