Revert 241151 "Make RenderFrameHostManager swap RenderFrameHosts..."

trunk/src/content/browser/renderer_host/render_view_host_factory.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/browser/renderer_host/render_view_host_factory.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 
 namespace content {
 
 // static
 RenderViewHostFactory* RenderViewHostFactory::factory_ = NULL;
 
 // static
 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, widget_delegate,
-                                          routing_id, main_frame_routing_id,
-                                          swapped_out);
+    return factory_->CreateRenderViewHost(instance, delegate, frame_delegate,
+                                          widget_delegate, routing_id,
+                                          main_frame_routing_id, swapped_out);
   }
-  return new RenderViewHostImpl(instance, delegate, widget_delegate, routing_id,
+  return new RenderViewHostImpl(instance, delegate, frame_delegate,
+                                widget_delegate, routing_id,
                                 main_frame_routing_id, swapped_out, hidden);
 }
 
 // static
 void RenderViewHostFactory::RegisterFactory(RenderViewHostFactory* factory) {
   DCHECK(!factory_) << "Can't register two factories at once.";
   factory_ = factory;
 }
 
 // static
 void RenderViewHostFactory::UnregisterFactory() {
   DCHECK(factory_) << "No factory to unregister.";
   factory_ = NULL;
 }
 
 }  // namespace content