Make the renderer-side prerendering code use RenderFrames instead of RenderViews.

content/browser/frame_host/frame_tree.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/frame_tree.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 77 matching lines @@
 }
 
 bool FrameTree::IsFirstNavigationAfterSwap() const {
   return root_->frame_id() == FrameTreeNode::kInvalidFrameId;
 }
 
 void FrameTree::OnFirstNavigationAfterSwap(int main_frame_id) {
   root_->set_frame_id(main_frame_id);
 }
 
-void FrameTree::AddFrame(int render_frame_host_id,
-                         int64 parent_frame_id,
-                         int64 frame_id,
-                         const std::string& frame_name) {
+RenderFrameHostImpl* FrameTree::AddFrame(int render_frame_host_id,
+                                         int64 parent_frame_id,
+                                         int64 frame_id,
+                                         const std::string& frame_name) {
   FrameTreeNode* parent = FindByFrameID(parent_frame_id);
   // TODO(ajwong): Should the renderer be killed here? Would there be a race on
   // shutdown that might make this case possible?
   if (!parent)
-    return;
+    return NULL;
 
-  parent->AddChild(CreateNode(frame_id, frame_name, render_frame_host_id,
-                              parent->navigator(),
-                              parent->render_frame_host()->GetProcess()));
+  scoped_ptr<FrameTreeNode> node(CreateNode(
+      frame_id, frame_name, render_frame_host_id, parent->navigator(),
+      parent->render_frame_host()->GetProcess()));
+  RenderFrameHostImpl* render_frame = node->render_frame_host();
+  parent->AddChild(node.Pass());
+  return render_frame;
 }
 
 void FrameTree::RemoveFrame(int64 parent_frame_id, int64 frame_id) {
   // If switches::kSitePerProcess is not specified, then the FrameTree only
   // contains a node for the root element. However, even in this case
   // frame detachments need to be broadcast outwards.
   //
   // TODO(ajwong): Move this below the |parent| check after the FrameTree is
   // guaranteed to be correctly populated even without the
   // switches::kSitePerProcess flag.
@@ skipping 55 matching lines @@
           this,
           render_frame_host_id,
           false));
 
   return make_scoped_ptr(new FrameTreeNode(navigator,
       render_frame_delegate_, render_view_delegate_, render_widget_delegate_,
       manager_delegate_, frame_id, frame_name, render_frame_host.Pass()));
 }
 
 }  // namespace content