Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/browser/renderer_host/render_view_host_factory.cc

Index: content/browser/renderer_host/render_view_host_factory.cc
diff --git a/content/browser/renderer_host/render_view_host_factory.cc b/content/browser/renderer_host/render_view_host_factory.cc
index fe51c7efe69e2e70e569af6e945298fb88e7ea93..5cffd134b8e4e3bdef3ba93cd88c0e20ecac91b4 100644
--- a/content/browser/renderer_host/render_view_host_factory.cc
+++ b/content/browser/renderer_host/render_view_host_factory.cc
@@ -16,19 +16,17 @@ RenderViewHostFactory* RenderViewHostFactory::factory_ = NULL;
 RenderViewHost* RenderViewHostFactory::Create(
     SiteInstance* instance,
     RenderViewHostDelegate* delegate,
-    RenderFrameHostDelegate* frame_delegate,
     RenderWidgetHostDelegate* widget_delegate,
     int routing_id,
     int main_frame_routing_id,
     bool swapped_out,
     bool hidden) {
   if (factory_) {
-    return factory_->CreateRenderViewHost(instance, delegate, frame_delegate,
-                                          widget_delegate, routing_id,
-                                          main_frame_routing_id, swapped_out);
+    return factory_->CreateRenderViewHost(instance, delegate, widget_delegate,
+                                          routing_id, main_frame_routing_id,
+                                          swapped_out);
   }
-  return new RenderViewHostImpl(instance, delegate, frame_delegate,
-                                widget_delegate, routing_id,
+  return new RenderViewHostImpl(instance, delegate, widget_delegate, routing_id,
                                 main_frame_routing_id, swapped_out, hidden);
 }