Make RenderFrame(Host) own a RenderWidget(Host).

content/browser/frame_host/render_frame_host_factory.cc

 // Copyright 2013 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/frame_host/render_frame_host_factory.h"
 
 #include "base/logging.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 
 namespace content {
 
 // static
 RenderFrameHostFactory* RenderFrameHostFactory::factory_ = NULL;
 
 // static
 scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create(
     RenderViewHostImpl* render_view_host,
     RenderFrameHostDelegate* delegate,
+    RenderWidgetHostDelegate* rwh_delegate,
     FrameTree* frame_tree,
     FrameTreeNode* frame_tree_node,
     int routing_id,
     int flags) {
   if (factory_) {
-    return factory_->CreateRenderFrameHost(render_view_host, delegate,
-                                           frame_tree, frame_tree_node,
-                                           routing_id, flags).Pass();
+    return factory_->CreateRenderFrameHost(
+                         render_view_host, delegate, rwh_delegate, frame_tree,

[nasko, 2015/01/14 20:08:04]

nit: This doesn't seem right for indent. It should be 4 spaces.

[kenrb, 2015/01/15 22:41:46]

Done.

+                         frame_tree_node, routing_id, flags).Pass();

[dcheng, 2015/01/14 20:49:02]

Drive-by: Pass() should not be needed here (and prevents copy elision)

[kenrb, 2015/01/15 22:41:46]

Done.

   }
-  return make_scoped_ptr(new RenderFrameHostImpl(render_view_host, delegate,
-                                                 frame_tree, frame_tree_node,
-                                                 routing_id, flags));
+  return make_scoped_ptr(
+      new RenderFrameHostImpl(render_view_host, delegate, rwh_delegate,
+                              frame_tree, frame_tree_node, routing_id, flags));
 }
 
 // static
 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) {
   DCHECK(!factory_) << "Can't register two factories at once.";
   factory_ = factory;
 }
 
 // static
 void RenderFrameHostFactory::UnregisterFactory() {
   DCHECK(factory_) << "No factory to unregister.";
   factory_ = NULL;
 }
 
 }  // namespace content